This is an automated email from the git hooks/post-receive script. New commit to branch feature/validVoteCounting in repository pollen. See http://git.chorem.org/pollen.git commit 6464c7113bb97748f91869a58eb5e885992333b3 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 28 13:50:22 2014 +0200 improve UI --- pollen-ui-angular/src/main/webapp/less/style.less | 43 ++++++++++++++-------- .../src/main/webapp/less/variables.less | 9 +++-- 2 files changed, 33 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 d67b103..e703f98 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -218,20 +218,30 @@ .pollAnim { background-color:inherit; - .transition-duration(@time-transition); + .transition(background @time-transition ease); + + .fade(); + + .voteTrue { + .fade(0); + } + + .voteFalse { + .fade(0); + } &:hover { background:@borderColor; - .transition-duration(@time-transition); + .transition(background @time-transition ease); .voteTrue { background-color: lighten(@brand-success, 15%); - .transition-duration(@time-transition); + .transition(background @time-transition ease); } .voteFalse { background-color: lighten(@brand-danger, 15%); - .transition-duration(@time-transition); + .transition(background @time-transition ease); } } } @@ -265,14 +275,13 @@ .pollChoice { - min-width:150px; - padding-left:5px; - padding-right:5px; - padding-top:10px; - padding-bottom:5px; - text-align:center; - border:1px solid @borderColor; - + min-width:150px; + padding-left:5px; + padding-right:5px; + padding-top:10px; + padding-bottom:5px; + text-align:center; + border:1px solid @borderColor; input[type=text]{ width:140px; @@ -284,12 +293,14 @@ &.voteTrue { background-color: lighten(@brand-success, 30%); - .transition-duration(@time-transition); + .transition(background @time-transition ease); + } &.voteFalse { background-color: lighten(@brand-danger, 30%); - .transition-duration(@time-transition); + .transition(background @time-transition ease); + } } @@ -359,11 +370,11 @@ .danger { color: @danger-color; - .transition-duration(@short-time-transition); + .transition(color @short-time-transition); &:hover, &:focus { color: @danger-hover-color; - .transition-duration(@short-time-transition); + .transition(color @short-time-transition); } } diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less index b917511..07cf640 100644 --- a/pollen-ui-angular/src/main/webapp/less/variables.less +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -48,13 +48,13 @@ transition-duration : @time; } -.fade() { +.fade(@time) { &.ng-enter { - .transition(all @short-time-transition ease @short-time-transition); + .transition(all @time ease @time); } &.ng-leave { - .transition(all @short-time-transition ease); + .transition(all @time ease); } &.ng-leave { @@ -70,5 +70,8 @@ &.ng-enter.ng-enter-active { opacity:1; } +} +.fade() { + .fade(@short-time-transition); } \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.