[pollen] branch develop updated (850b979 -> 354d32b)
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 850b979 change icon delete new af95052 Fix choices tables border style new 354d32b Merge branch 'develop' of https://git.chorem.org/pollen into develop The 2 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 354d32b16acc61e6116f1ed2894b43b18c628da9 Merge: af95052 850b979 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Aug 29 12:22:43 2014 +0200 Merge branch 'develop' of https://git.chorem.org/pollen into develop commit af950522c68f7032960869aad262a0434a40d9cf Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Aug 29 12:22:39 2014 +0200 Fix choices tables border style Summary of changes: pollen-ui-angular/src/main/webapp/less/style.less | 50 ++++++++++++++--------- 1 file changed, 31 insertions(+), 19 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 af950522c68f7032960869aad262a0434a40d9cf Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Aug 29 12:22:39 2014 +0200 Fix choices tables border style --- pollen-ui-angular/src/main/webapp/less/style.less | 50 ++++++++++++++--------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index af51b23..f5d5fff 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -379,30 +379,42 @@ body { } } +tr { + td { + &.pollChoice { + padding: 10px 5px 5px; + text-align:center; + border-top: 1px solid @border-color; + border-left: 1px solid @border-color; -.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; + } - 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); + } - &.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; + } } - &.voteFalse { - background-color: lighten(@brand-danger, 30%); - .transition(background @time-transition ease); - + &:last-child { + td.pollChoice { + border-bottom: 1px solid @border-color; + } } } @@ -642,4 +654,4 @@ footer { &.fade .modal-dialog { .translate(0, 0); } -} \ No newline at end of file +} -- 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 354d32b16acc61e6116f1ed2894b43b18c628da9 Merge: af95052 850b979 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Aug 29 12:22:43 2014 +0200 Merge branch 'develop' of https://git.chorem.org/pollen into develop pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 6 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 +- .../src/main/webapp/js/controllers/userCtrl.js | 18 +++-- .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-link.html | 2 +- .../src/main/webapp/partials/poll-list.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 4 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/user-admin-list.html | 2 +- .../{user-edit.html => user-edit-editProfile.html} | 47 +---------- .../{user-edit.html => user-edit-password.html} | 42 ---------- .../webapp/partials/user-edit-viewProfile.html | 26 ++++++ .../src/main/webapp/partials/user-edit.html | 94 ++-------------------- 16 files changed, 69 insertions(+), 192 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm