This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI in repository pollen. See http://git.chorem.org/pollen.git commit d1937b23e61f2ee6cf36c67b6b2fa1908c641ea2 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Mar 17 17:05:48 2015 +0100 Refs #1204 : Fixes less error --- pollen-ui-angular/pom.xml | 1 - pollen-ui-angular/src/main/webapp/less/main.less | 22 +++++++++++++++------- .../src/main/webapp/less/variables.less | 3 +++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 8e3d003..f27534d 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -147,7 +147,6 @@ <outputDirectory>${project.basedir}/src/main/webapp/css</outputDirectory> <compress>true</compress> <includes> - <include>style.less</include> <include>main.less</include> </includes> </configuration> diff --git a/pollen-ui-angular/src/main/webapp/less/main.less b/pollen-ui-angular/src/main/webapp/less/main.less index 5b33890..4cf9a94 100644 --- a/pollen-ui-angular/src/main/webapp/less/main.less +++ b/pollen-ui-angular/src/main/webapp/less/main.less @@ -57,11 +57,11 @@ body { /* Layout -------------------------------------------------- */ #wrapper #side-menu { - width: 10%; + width: @side-menu-width; } #top-bar .content, #wrapper #poll-content { - margin-left: 10%; /* Same width as #wrapper #side-menu */ + margin-left: @side-menu-width; position: relative; } @@ -169,15 +169,23 @@ main .actions-buttons { li { font-size: 13px; margin: 60px 0; - color: #CCC; - &:hover { - color: #777; + a { + color: #CCC; + font-weight: bold; + + &:hover { + color: #777; + } } - &.current { - color: #777; + + &.active { position: relative; + a { + color: #777; + } + &:after, &:before { right: -1px; diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less index 09a0223..33a0290 100644 --- a/pollen-ui-angular/src/main/webapp/less/variables.less +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -31,6 +31,9 @@ @palette-light-white: #FFF; @palette-light-grey: #e8e8e8; +@side-menu-width: 6%; + + @border-color : #dddddd; @danger-color : @brand-danger; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.