[pollen] branch develop updated (fb29704 -> f9965bc)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from fb29704 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop new f9965bc no fixed height for print vote, and action for vote on one line The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f9965bc96516b19e2d99dec304eafce9fcd12351 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 16:17:16 2014 +0200 no fixed height for print vote, and action for vote on one line Summary of changes: pollen-ui-angular/src/main/webapp/less/style.less | 96 +++++++++++----------- .../src/main/webapp/partials/inline-poll.html | 8 +- 2 files changed, 53 insertions(+), 51 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit f9965bc96516b19e2d99dec304eafce9fcd12351 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 16:17:16 2014 +0200 no fixed height for print vote, and action for vote on one line --- pollen-ui-angular/src/main/webapp/less/style.less | 96 +++++++++++----------- .../src/main/webapp/partials/inline-poll.html | 8 +- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index f5d5fff..2882f96 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -305,19 +305,60 @@ body { #poll-inline { - border-collapse: separate; + border-collapse: collapse; border-spacing: 0px; - tr td { - height: 60px; + tr { + td { + &.pollChoice { + padding: 10px 5px 5px; + text-align:center; + border: 1px solid @border-color; + + input[type=text]{ + width:@width-input-vote; + } + input[type=checkbox]{ + width:25px; + height:25px; + } + + &.voteTrue { + background-color: lighten(@brand-success, 30%); + .transition(background @time-transition ease); + } + + &.voteFalse { + background-color: lighten(@brand-danger, 30%); + .transition(background @time-transition ease); + } + } - &:first-child { - background-color: @background-color; + &:first-child { + background-color: @background-color; + + &.sticky { + position: relative; + display: block; + border-bottom: 0px; + border-right:0px; + } + } + &.vote-action { + div { + width: 90px; + } + } + + &.vote-input { + height: 60px; + } + } - &.sticky { - position: relative; - display: block; + &:last-child { + td.sticky { + border-bottom: 1px solid @border-color; } } } @@ -379,45 +420,6 @@ body { } } -tr { - td { - &.pollChoice { - padding: 10px 5px 5px; - text-align:center; - border-top: 1px solid @border-color; - border-left: 1px solid @border-color; - - input[type=text]{ - width:@width-input-vote; - } - input[type=checkbox]{ - width:25px; - height:25px; - } - - &.voteTrue { - background-color: lighten(@brand-success, 30%); - .transition(background @time-transition ease); - } - - &.voteFalse { - background-color: lighten(@brand-danger, 30%); - .transition(background @time-transition ease); - } - } - - &:nth-last-child(2).pollChoice { - border-right: 1px solid @border-color; - } - } - - &:last-child { - td.pollChoice { - border-bottom: 1px solid @border-color; - } - } -} - .fixe-input .ng-hide { display:inline-block !important; visibility:hidden; diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 54727b5..3d6a1ea 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -65,8 +65,8 @@ <!-- end print choice --> <!-- begin input vote --> - <tr ng-show="!globalVariables.editMode" ng-if="data.poll.canVote"> - <td class="pollChoice"> + <tr ng-if="!globalVariables.editMode && data.poll.canVote"> + <td class="pollChoice vote-input"> <input-error error="data.vote.restError.voterName[0]" data="data.vote.voterName"> <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" focus-me="true" /> </input-error> @@ -83,7 +83,7 @@ <!-- end input vote --> <!-- begin print vote --> - <tr ng-show="!globalVariables.editMode" ng-repeat="vote in data.votants track by $index" class="pollAnim"> + <tr ng-if="!globalVariables.editMode" ng-repeat="vote in data.votants track by $index" class="pollAnim"> <td class="pollChoice"> <div class="text-muted" ng-hide="vote.onEdit"> {{vote.voterName}} @@ -127,7 +127,7 @@ </input-error> </div> </td> - <td> + <td class="vote-action"> <div ng-if="!data.poll.isClosed"> <button class="btn btn-primary" ng-if="vote.permission && !globalVariables.editMode && vote.onEdit" ng-click="saveVote(vote)"> <span class="fa fa-check"></span> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm