This is an automated email from the git hooks/post-receive script. New commit to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git commit aa9fcffeafb46adede8348d04df289d1fe905b38 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 5 15:53:54 2014 +0200 add button save in all create poll page, fix label-block, improve UI --- pollen-ui-angular/src/main/webapp/less/style.less | 168 +++++++++++---------- .../src/main/webapp/less/variables.less | 2 +- .../src/main/webapp/partials/poll-poll.html | 5 - .../src/main/webapp/partials/poll.html | 6 +- 4 files changed, 94 insertions(+), 87 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index c1c3ae3..d87a1b9 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -49,8 +49,8 @@ body { /* global min width */ @media screen and (max-width: @responsive-min-width) { - #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link, footer { - width:@responsive-min-width !important; + body, footer, #pollenMenu { + width:@responsive-min-width; } } @@ -157,10 +157,6 @@ body { .transition(margin linear @short-time-transition); } - label.label-block { - display:block !important; - } - } @@ -217,68 +213,109 @@ body { } } - -.pollTitle, .pollDesc { - margin-top:15px; - min-height:60px; - border-radius:5px; - padding-left:5px; - margin-bottom:30px; -} - -.pollAnim { - background-color:inherit; - .transition(background @time-transition ease); - - .fade(); - - .voteTrue { - .fade(0); +#poll-content { + h4 { + font-weight: bold; + border-left: 8px solid; + padding-left: 4px; + color: #555; } - .voteFalse { - .fade(0); + .pollTitle, .pollDesc { + margin-top:15px; + min-height:60px; + border-radius:5px; + padding-left:5px; + margin-bottom:30px; } - &:hover { - background:@borderColor; + .pollAnim { + background-color:inherit; .transition(background @time-transition ease); + .fade(); + .voteTrue { - background-color: lighten(@brand-success, 15%); - .transition(background @time-transition ease); + .fade(0); } .voteFalse { - background-color: lighten(@brand-danger, 15%); + .fade(0); + } + + &:hover { + background:@borderColor; .transition(background @time-transition ease); + + .voteTrue { + background-color: lighten(@brand-success, 15%); + .transition(background @time-transition ease); + } + + .voteFalse { + background-color: lighten(@brand-danger, 15%); + .transition(background @time-transition ease); + } } } -} -#poll { - text-align:center; + #poll { + text-align:center; + + table { + margin:auto; + margin-bottom:8px; + } + + #poll-inline { + .btn-large { + height:60px; + width:80px; + } - table { - margin:auto; - margin-bottom:8px; + img { + max-width: @preview-size; + max-height: @preview-size; + } + + .spinner { + height:64px; + width:150x !important; + z-index:1000 !important; + } + } } - #poll-inline { - .btn-large { - height:60px; - width:80px; + .pollBigChoice { + border-bottom:1px solid @borderColor; + text-align:right; + + h3 { + background-color:rgba(0,0,0,0.1); + padding:5px; + height:40px; + + input[type=text] { + width:99%; + text-align:right; + } } - img { - max-width: @preview-size; - max-height: @preview-size; + button { + height:30px; } - .spinner { - height:64px; - width:150x !important; - z-index:1000 !important; + p { + text-align:justify; + white-space:pre-line; + } + textarea { + width:99%; + } + + .pollChoiceInput { + margin-top:20px; + text-align:center; } } } @@ -326,39 +363,6 @@ body { visibility:hidden; } -.pollBigChoice { - border-bottom:1px solid @borderColor; - text-align:right; - - h3 { - background-color:rgba(0,0,0,0.1); - padding:5px; - height:40px; - - input[type=text] { - width:99%; - text-align:right; - } - } - - button { - height:30px; - } - - p { - text-align:justify; - white-space:pre-line; - } - textarea { - width:99%; - } - - .pollChoiceInput { - margin-top:20px; - text-align:center; - } -} - .pool-alert { position: fixed; top:@height-pollen-menu + 10px; @@ -463,6 +467,10 @@ hr { border-top:1px solid #CCCCCC; } +label.label-block { + display:block !important; +} + .table-result { margin-left: auto; margin-right: auto; diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less index 911be87..9189273 100644 --- a/pollen-ui-angular/src/main/webapp/less/variables.less +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -34,7 +34,7 @@ @height-footer: 20px; @responsive-large-width : 1024px; -@responsive-min-width : 770px; +@responsive-min-width : 800px; @responsive-height: 600px; @preview-size:200px; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html index cca1a46..bb0dff9 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -44,8 +44,3 @@ <div ng-include="templateURL"></div> </div> - -<div ng-if="globalVariables.create"> - <hr/> - <button class="btn btn-primary" ng-click="savePoll()"><span class="glyphicon glyphicon-save"></span> {{ 'action.save' | translate }}</button> -</div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index d29a04c..ea5863a 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -50,6 +50,11 @@ <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'" class="anim-fade"></div> <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'" class="anim-fade"></div> + + <div> + <hr/> + <button class="btn btn-primary" ng-click="savePoll()"><span class="glyphicon glyphicon-save"></span> {{ 'action.save' | translate }}</button> + </div> </div> @@ -57,7 +62,6 @@ <div ng-include="'./partials/poll-result.html'" ng-if="tab == 'result'" ng-controller="PollResultCtrl" class="anim-fade"></div> - </div> <div ng-include="'./partials/poll-link.html'" id="poll-link" ng-class="{'mini-link': globalVariables.minify}" ng-show="data.poll.id"></div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.