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 f70e0fa648e10b57fb55527eaacb6d060a83c41c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 11:30:19 2014 +0200 improve UI for footer and poll-link --- pollen-ui-angular/src/main/webapp/less/style.less | 53 ++++++++++------------ .../src/main/webapp/partials/poll-link.html | 7 --- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 223e061..77ca38f 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -21,6 +21,17 @@ @import "variables.less"; +html { + height: 100%; +} + +body { + position:relative; + margin:0; + min-height:100%; + padding-bottom: 4rem; +} + #pollenMenu { position:fixed; width:100%; @@ -29,7 +40,7 @@ left:0px; } #content { - margin-top:60px; + padding-top:60px; .fade(); #poll-content .anim-fade { @@ -127,9 +138,6 @@ margin-bottom:30px; font-size:1.2em; - &.empty { - display:none; - } &.toMini { text-align:right; } @@ -159,12 +167,11 @@ /* width < @responsive-large-width */ @media screen and (max-width: @responsive-large-width) { - @foot-padding : 1.8%; - @foot-height : 80px; + @foot-height : 125px; #poll-link { text-align:center; - position:fixed; + position:absolute; bottom:0px; left:0px; width:100%; @@ -178,33 +185,19 @@ list-style-type:none; display:inline-block; margin:0px; - padding-left: @foot-padding; - padding-right: @foot-padding; + width:33%; + float:left; + text-align:left; li.toMini { display:none; } } - - input { - display:none; - } - - /* height < @responsive-height */ - @media (max-height: @responsive-height) { - position:relative; - background-color:inherit; - border-color: @borderColor; - } } #poll-content { - margin-bottom: @foot-height + 15px; - - @media (max-height: @responsive-height) { - margin-bottom:0px; - } + margin-bottom: @foot-height; } } @@ -510,16 +503,20 @@ hr { footer { position: absolute; - bottom: 0px; + right: 0; + bottom: 0; + left: 0; + height:20px; width: 100%; background-color: #222; color: #999; text-align: center; border-top: 1px solid #080808; + z-index:1000; .separator { - padding-left:1.5%; - padding-right:1.5%; + padding-left:.75%; + padding-right:.75%; } a { diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index 21fd606..4f8428b 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -40,10 +40,6 @@ </a> <input type="text" select-on-click value="{{globalVariables.linkResult}}" readonly class="form-control input-mini"/> </li> - - <li class="empty" ng-hide="! data.poll.isClosed"> </li> - <li class="empty" ng-hide="data.poll.resultIsVisible"> </li> - <li class="empty"> </li> </ul> <ul ng-if="data.poll.permission"> @@ -84,8 +80,5 @@ <span class="text">{{ 'poll.link.delete' | translate }}</span> </a> </li> - - <li class="empty" ng-hide="!data.poll.isClosed"> </li> - <li class="empty"> </li> </ul> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.