From 38bfc8bb62f11160910e9da8d7dbffef41ae76ee Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 22 Mar 2017 15:20:49 +0100 Subject: [PATCH] SPR-910: var rename - border-color --- css/area_content.less | 2 +- css/area_footer.less | 2 +- css/area_forms.less | 4 ++-- css/area_header.less | 2 +- css/area_main-content.less | 2 +- css/area_main-sidebar-nav.less | 4 ++-- css/area_nav-breadcrumb.less | 4 ++-- css/area_nav-metabox.less | 2 +- css/area_nav-usertools.less | 4 ++-- css/area_sidebar-search.less | 4 ++-- css/base.less | 11 ++++++++--- css/base_design.less | 20 ++++++++++---------- css/plugins/magic-matcher.less | 4 ++-- 13 files changed, 35 insertions(+), 30 deletions(-) diff --git a/css/area_content.less b/css/area_content.less index 8ddbc7a..c104cb1 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -22,7 +22,7 @@ box-sizing: border-box; width: 100%; background-color: @background_page-header; - border-bottom: 1px solid @color-border-light; + border-bottom: 1px solid @ini_border_light; } #plugin__highlightparent { diff --git a/css/area_footer.less b/css/area_footer.less index c2afe19..f5edef4 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -12,7 +12,7 @@ .page-footer { min-height: @page-header_height; background-color: @background_page-header; - border-top: 1px solid @color-border-light; + border-top: 1px solid @ini_border_light; border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius font-size: @font-size-default; text-align: right; diff --git a/css/area_forms.less b/css/area_forms.less index fd2b0c9..b7ed8d2 100644 --- a/css/area_forms.less +++ b/css/area_forms.less @@ -121,7 +121,7 @@ textarea, select, keygen { min-height: @formfield_min-height; - border: 1px solid @color-border; + border: 1px solid @ini_border; box-shadow: inset 0 0 1px #eee; border-radius: @fix_border-radius; padding-left: .3rem; @@ -268,7 +268,7 @@ textarea[readonly] { background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background-color: #eee; opacity: .5; - border: 1px solid @color-border; + border: 1px solid @ini_border; border-radius: @fix_border-radius; color: #333; font-weight: normal; diff --git a/css/area_header.less b/css/area_header.less index 190e87f..6a96e78 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -125,7 +125,7 @@ min-width: @toggle-size; box-sizing: border-box; background-color: #fff; - border: 1px solid @color-border; + border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius color: @color-nav; font-size: 1rem; diff --git a/css/area_main-content.less b/css/area_main-content.less index 6db9048..9355564 100755 --- a/css/area_main-content.less +++ b/css/area_main-content.less @@ -25,7 +25,7 @@ > hr { margin-top: 3em; margin-bottom: 0.5em; - border-top: dashed @color-border-light 2px; + border-top: dashed @ini_border_light 2px; border-bottom: none; } } diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 95c8608..fda0463 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -44,7 +44,7 @@ width: @menu-margin; height: @icon-size; flex-grow: 0; - border-right: 1px solid @color-border; + border-right: 1px solid @ini_border; text-align: center; margin-right: @margin-small; color: inherit; @@ -124,7 +124,7 @@ left: 0; width: 100%; height: 1px; - border-bottom: solid 1px @color-border; + border-bottom: solid 1px @ini_border; } &:hover, diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 836fd02..957a36f 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -6,7 +6,7 @@ .breadcrumbs { position: relative; - border-bottom: 1px solid @color-border-light; + border-bottom: 1px solid @ini_border_light; padding: 1rem 1.8rem .2rem; min-height: @page-header_height; box-sizing: border-box; @@ -105,7 +105,7 @@ display: block; width: auto; min-height: @toggle-size; - border: 1px solid @color-border; + border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius color: @color-nav; text-align: center; diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 18feb4c..61a3524 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -99,7 +99,7 @@ position: relative; display: block; background-color: @color-site-bg; - border: 1px solid @color-border-light; + border: 1px solid @ini_border_light; color: @color-link; font-size: @font-size-small; line-height: 1.42857143; diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 1ae889a..6c9ed9c 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -31,7 +31,7 @@ width: auto; min-height: @toggle-size; overflow: hidden; - border: 1px solid @color-border; + border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius color: @color-nav; text-align: center; @@ -49,7 +49,7 @@ &.user { position: relative; display: table-cell; - border: solid 1px @color-border; + border: solid 1px @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius padding-right: .3rem; diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less index d03c834..3406f03 100755 --- a/css/area_sidebar-search.less +++ b/css/area_sidebar-search.less @@ -127,7 +127,7 @@ button[type="submit"] { border: solid 1px transparent; - border-right-color: @color-border; + border-right-color: @ini_border; margin-left: -(@icon-size); &::after { @@ -137,7 +137,7 @@ bottom: 15%; width: 1px; left: -1px; - background-color: @color-border; + background-color: @ini_border; transition: @transition background-color; } } diff --git a/css/base.less b/css/base.less index 266489b..107daed 100755 --- a/css/base.less +++ b/css/base.less @@ -13,9 +13,6 @@ @font_family_screen: __font_family_screen__; -@color-text: __text__; -@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__; @@ -38,6 +35,14 @@ @th_background: __background_alt__; +/* ersetzt: */ + +//@color-text: __text__; +//@border-radius: __default_border_radius__; +//@color-border: __border__; +//@color-border-light: __border_light__; + + /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* global vars */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ diff --git a/css/base_design.less b/css/base_design.less index e08a732..647a3f5 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -69,8 +69,8 @@ a { } } -.content #dokuwiki__pagetools{ - @media @screen_max-md{ +.content #dokuwiki__pagetools { + @media @screen_max-md { top: 4rem; } } @@ -313,7 +313,7 @@ table { border-collapse: collapse; empty-cells: show; border-spacing: 0; - border: 1px solid @color-border; + border: 1px solid @ini_border; font-size: @font-size-default; line-height: 140%; } @@ -332,7 +332,7 @@ td { padding: .3em .5em; margin: 0; vertical-align: top; - border: 1px solid @color-border; + border: 1px solid @ini_border; } th { @@ -385,7 +385,7 @@ button img { } hr { - border-top: solid @color-border; + border-top: solid @ini_border; border-bottom: solid @ini_background; border-width: 1px 0; height: 0; @@ -420,24 +420,24 @@ kbd { direction: ltr; text-align: left; background-color: @color-site-bg; - color: @color-text; - box-shadow: inset 0 0 .3em @color-border; + color: @ini_text; + box-shadow: inset 0 0 .3em @ini_border; border-radius: @fix_border-radius; } pre { overflow: auto; word-wrap: normal; - border: 1px solid @color-border; + border: 1px solid @ini_border; border-radius: @fix_border-radius; - box-shadow: inset 0 0 .5em @color-border; + box-shadow: inset 0 0 .5em @ini_border; font-size: @font-size-default; line-height: 140%; padding: .7em 1em; } blockquote { - border: solid @color-border; + border: solid @ini_border; border-width: 0 0 0 .25em; font-size: @font-size-default; line-height: 140%; diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 271ed28..d2a7729 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -21,8 +21,8 @@ right: 0; top: 0; border: 0; - border-bottom: 1px solid @color-border; - border-left: 1px solid @color-border; + border-bottom: 1px solid @ini_border; + border-left: 1px solid @ini_border; color: @color-nav; background: #fff; border-radius: 0;