From 3cdc9fcb67f99d27c8851a0155fad41fe7ea94cc Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 23 Mar 2017 12:55:46 +0100 Subject: [PATCH] SPR-910: var rename - nav_menu_color, nav_menu_hover_color, nav_menu_hover_bg --- css/area_header.less | 8 ++++---- css/area_main-sidebar-nav.less | 16 ++++++++-------- css/area_nav-breadcrumb.less | 8 ++++---- css/area_nav-pagetools.less | 12 ++++++------ css/area_nav-usertools.less | 22 +++++++++++----------- css/area_sidebar-search.less | 8 ++++---- css/base.less | 9 ++++----- css/base_mixins.less | 10 +++++----- css/plugins/magic-matcher.less | 2 +- 9 files changed, 47 insertions(+), 48 deletions(-) diff --git a/css/area_header.less b/css/area_header.less index 6a96e78..76bca66 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -127,7 +127,7 @@ background-color: #fff; border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - color: @color-nav; + color: @ini_nav_menu_color; font-size: 1rem; text-align: center; text-decoration: none; @@ -142,9 +142,9 @@ &:hover, &:active, &:focus { - background-color: @color-nav-hover-bg; - border-color: @color-nav-hover; - color: @color-nav-hover; + background-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_color; } } } diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index fda0463..754ec5c 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -24,7 +24,7 @@ height: @icon-size + @margin-small; border: 1px solid transparent; border-radius: @fix_border-radius; - color: @color-nav; + color: @ini_nav_menu_color; font-size: @font-size-head6; font-weight: normal; margin: -1px 0 (@font-size-head6 / 2) (@menu-margin * -1); // moves the toggles back to the left @@ -60,7 +60,7 @@ vertical-align: baseline; text-align: center; color: inherit; - border: 2px solid @color-nav; + border: 2px solid @ini_nav_menu_color; border-top-right-radius: 50%; border-bottom-left-radius: 50%; } @@ -71,7 +71,7 @@ height: @icon-size; path { - fill: @color-nav; + fill: @ini_nav_menu_color; transition: @transition all; } } @@ -80,19 +80,19 @@ &:hover, &:focus, &:active { - background-color: @color-nav-hover-bg; - border-color: @color-nav-hover; - color: @color-nav-hover; + background-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_color; text-decoration: none; span.ico { strong { - border-color: @color-nav-hover-bg; + border-color: @ini_nav_menu_hover_bg; } svg { path { - fill: @color-nav-hover; + fill: @ini_nav_menu_hover_color; } } } diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 957a36f..789347c 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -107,7 +107,7 @@ min-height: @toggle-size; border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - color: @color-nav; + color: @ini_nav_menu_color; text-align: center; margin: 0; } @@ -154,9 +154,9 @@ &:hover, &:active, &:focus { - background-color: @color-nav-hover-bg; - border-color: @color-nav-hover; - color: @color-nav-hover; + background-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_color; .prefix { color: inherit; diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 902d10c..1cc873f 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -58,7 +58,7 @@ nav#dokuwiki__pagetools { min-height: @toolbox-size; // for nav:hover width: @toolbox-size; // for nav:hover opacity: .6; - color: @color-nav; + color: @ini_nav_menu_color; font-size: @font-size-default; padding: 2px @toolbox-size 2px 2px; @@ -74,7 +74,7 @@ nav#dokuwiki__pagetools { &:focus, &:active { opacity: 1; - color: @color-nav-hover; + color: @ini_nav_menu_hover_color; background-color: #FFF; } @@ -90,7 +90,7 @@ nav#dokuwiki__pagetools { width: @page-tools_svg-size; height: @page-tools_svg-size; vertical-align: middle; - fill: @color-nav; + fill: @ini_nav_menu_color; margin: @page-tools_svg-space; } @@ -102,7 +102,7 @@ nav#dokuwiki__pagetools { &.plugin_move_page { a { opacity: .6; - color: @color-nav; + color: @ini_nav_menu_color; * { color: inherit; @@ -111,7 +111,7 @@ nav#dokuwiki__pagetools { &:hover, &:focus, &:active { - color: @color-nav-hover; + color: @ini_nav_menu_hover_color; background-color: #fff; opacity: 1; } @@ -139,7 +139,7 @@ nav#dokuwiki__pagetools { opacity: 1; svg { - fill: @color-nav-hover; + fill: @ini_nav_menu_hover_color; } } diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 6c9ed9c..2a507e0 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -33,7 +33,7 @@ overflow: hidden; border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - color: @color-nav; + color: @ini_nav_menu_color; text-align: center; margin: 0; @@ -80,7 +80,7 @@ background: #FFF; // for removing bg-image border: 0 none; text-indent: 0; - color: @color-nav; + color: @ini_nav_menu_color; font-size: inherit; margin-right: -.3rem; padding: 0 .2em 0 0; @@ -110,7 +110,7 @@ right: -1px; width: auto; opacity: 0; - border: solid 1px @color-nav-hover; + border: solid 1px @ini_nav_menu_hover_color; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius transform: none; transition: @transition opacity; @@ -119,9 +119,9 @@ &:hover, &:focus, &:active { - background-color: @color-nav-hover-bg; - border-color: @color-nav-hover; - color: @color-nav-hover; + background-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_color; &::before { opacity: 1; @@ -129,7 +129,7 @@ bdi, bdi:first-of-type { - color: @color-nav-hover; + color: @ini_nav_menu_hover_color; &::before { color: inherit; @@ -156,7 +156,7 @@ position: absolute; left: -2px; font-size: 1.4rem; - color: @color-nav; + color: @ini_nav_menu_color; margin: 0; transition: @transition color; @@ -250,9 +250,9 @@ &:hover, &:active, &:focus { - background-color: @color-nav-hover-bg; - border-color: @color-nav-hover; - color: @color-nav-hover; + background-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_color; } /* icon register new user */ diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less index 3406f03..f3cc86d 100755 --- a/css/area_sidebar-search.less +++ b/css/area_sidebar-search.less @@ -22,7 +22,7 @@ background-image: none; background-color: transparent; // fix border: solid 1px transparent; - color: @color-nav; // fix + color: @ini_nav_menu_color; // fix padding: 0; transition: @transition color, @transition background-color, @transition border-color; @@ -76,9 +76,9 @@ &:hover, &:focus, &:active { - background-color: @color-nav-hover-bg; - border-color: @color-nav-hover; - color: @color-nav-hover; + background-color: @ini_nav_menu_hover_bg; + border-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_color; } } } diff --git a/css/base.less b/css/base.less index 107daed..a778b2b 100755 --- a/css/base.less +++ b/css/base.less @@ -13,15 +13,11 @@ @font_family_screen: __font_family_screen__; -@color-nav: __nav_menu_color__; -@color-nav-hover: __nav_menu_hover_color__; -@color-nav-hover-bg: __nav_menu_hover_bg__; - @color-content-bg: __background_content__; @color-site-bg: __background_site__; @color-link: __existing__; -@color-link-hover: @color-nav; +@color-link-hover: @ini_nav_menu_color; @button_color: __button_color__; @button_background: __button_background__; @@ -41,6 +37,9 @@ //@border-radius: __default_border_radius__; //@color-border: __border__; //@color-border-light: __border_light__; +//@color-nav: __nav_menu_color__; +//@color-nav-hover: __nav_menu_hover_color__; +//@color-nav-hover-bg: __nav_menu_hover_bg__; /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ diff --git a/css/base_mixins.less b/css/base_mixins.less index 7668aa1..a40ad9a 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -147,7 +147,7 @@ min-height: @elem; min-width: @elem; box-sizing: border-box; - color: @color-nav; + color: @ini_nav_menu_color; font-size: @font-size-small; padding: 0; margin: 0 .25rem; @@ -162,9 +162,9 @@ position: absolute; right: -.4rem; top: -.4em; - background-color: @color-nav-hover; + background-color: @ini_nav_menu_hover_bg; border-radius: 2px; - color: @color-nav-hover-bg; + color: @ini_nav_menu_hover_color; font-size: @font-size-very-small; font-weight: 400; text-align: center; @@ -178,8 +178,8 @@ &:active, &:focus { .num { - background-color: @color-nav-hover; - color: @color-nav-hover-bg; + background-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_bg; } } } diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index d2a7729..df0d67f 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -23,7 +23,7 @@ border: 0; border-bottom: 1px solid @ini_border; border-left: 1px solid @ini_border; - color: @color-nav; + color: @ini_nav_menu_color; background: #fff; border-radius: 0; border-bottom-left-radius: 5px;