From dba38052f8687ae5d617af3b091ed324d75c8845 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 5 Jan 2017 10:47:49 +0100 Subject: [PATCH] using button-color + button-background --- css/area_main-sidebar.less | 62 ++++++++++++++++++++++-------------- css/area_nav-breadcrumb.less | 4 ++- css/area_nav-usertools.less | 14 ++------ css/area_sidebar-search.less | 6 ++-- css/area_sidetools.less | 16 ++++++++-- css/base_mixins.less | 2 +- 6 files changed, 62 insertions(+), 42 deletions(-) diff --git a/css/area_main-sidebar.less b/css/area_main-sidebar.less index a750446..87370ae 100644 --- a/css/area_main-sidebar.less +++ b/css/area_main-sidebar.less @@ -21,6 +21,7 @@ } li { + list-style-type: none; color: @color-nav; &:first-of-type { @@ -29,16 +30,26 @@ } .li { - color: @color-nav; - a { - color: inherit; + display: list-item; + list-style-type: square; + color: @color-nav; + padding-top: .1rem; + padding-bottom: .1rem; + transition: @transition color; + + &:hover, + &:focus, + &:active { + color: @button_color; + } } } /* + + + first level + + + */ - > li {position: relative; + > li { + position: relative; list-style-type: none; margin: 0; padding: 0 0 .3rem 0; @@ -48,22 +59,20 @@ content: ''; position: absolute; left: 0; - bottom: 0px; + bottom: 0; display: block; width: 100%; height: 1px; background-color: @color-border; - transition: @transition background-color; } > .li { position: relative; z-index: 1; - padding: .5rem 0 .5rem (@icon-size + 1); margin-top: -1px; + padding: .5rem 0 .5rem (@icon-size + 1); &::before { - color: @color-nav; content: counter(nav-counter); position: absolute; top: 0; @@ -77,6 +86,7 @@ height: 100%; width: @icon-size; overflow: hidden; + color: @color-nav; text-align: center; margin-top: auto; margin-bottom: auto; @@ -90,7 +100,6 @@ width: 1px; left: (@icon-size + .5); background-color: @color-border; - transition: @transition background-color; } &.opened, @@ -129,6 +138,7 @@ text-align: center; margin-top: auto; margin-bottom: auto; + transition: @transition color; } &::after { @@ -145,37 +155,41 @@ &:hover, &:focus, &:active { - background-color: #fff; - border-color: @color-link; - color: @color-link; + background-color: @button_background; + border-color: @button_color; + color: @button_color; text-decoration: none; + + &::before { + color: @button_color; + } + + &::after { + background-color: @button_color; + } } } } &.opened { a { - background-color: @color-link; - color: #fff; + background-color: @button_color; + color: @button_background; - &::after, - &::before{ - color: #fff; - border-color: #fff; + &::before { + color: @button_background; } &:hover, &:focus, &:active { - background-color: #fff; - border-color: @color-link; - color: @color-link; + background-color: @button_background; + border-color: @button_color; + color: @button_color; text-decoration: none; - &::after, &::before { - color: inherit; - border-color: inherit; + color: @button_color; } } } diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 4fc30ab..38b861e 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -160,6 +160,8 @@ } } -.mode_admin{ + +/* + + + + + ? + + + + + */ +.mode_admin { } diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 74a38ec..0d1b134 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -90,17 +90,9 @@ } .prefix { - .btn-prefix (); + .btn-prefix(); .icon-clipboard(); } - - &.opentasks, - &.opentask { - .num { - background-color: @color-link; - color: #fff; - } - } } // user-task } // li @@ -118,10 +110,10 @@ &:hover, &:active, &:focus { - border-color: @color-nav-hover; + border-color: @button_color; //-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); //box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); - color: @color-nav-hover; + color: @button_color; } &::before { diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less index f48f501..ff96456 100755 --- a/css/area_sidebar-search.less +++ b/css/area_sidebar-search.less @@ -46,11 +46,11 @@ &:hover, &:focus, &:active { - border: solid 1px @color-link; - color: @color-link; + border: solid 1px @button_color; + color: @button_color; &::after { - background-color: @color-link; + background-color: @button_color; } } diff --git a/css/area_sidetools.less b/css/area_sidetools.less index 1c69786..348a927 100644 --- a/css/area_sidetools.less +++ b/css/area_sidetools.less @@ -50,16 +50,28 @@ } } + /* + + + linklist + + + */ ul { padding-left: (@icon-size + .5); } li { - color: @color-nav; + list-style-type: none; a { - color: inherit; + display: list-item; + list-style-type: square; + color: @color-nav; + padding-top: .1rem; + padding-bottom: .1rem; + transition: @transition color; + + &:hover, + &:focus, + &:active { + color: @button_color; + } } &:first-of-type { diff --git a/css/base_mixins.less b/css/base_mixins.less index 115cc6a..9f75f95 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -164,7 +164,7 @@ top: -.4em; background-color: @button_color; border-radius: 2px; - color: #fff; + color: @button_background; font-size: .6rem; font-weight: 400; text-align: center;