diff --git a/css/area_content.less b/css/area_content.less index e2144bc..8475b3a 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -14,7 +14,7 @@ &::before{ content: ""; background-color: @background_page-header; - border-bottom: 1px solid @color-border; + border-bottom: 1px solid @color-border-light; position: absolute; top: 0; left: 0; height: 3rem; width: 100%; diff --git a/css/area_footer.less b/css/area_footer.less index ec50151..7a7dea7 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -11,7 +11,7 @@ @media screen { .page-footer { background: @background_page-header; - border-top: 1px solid @color-border; + border-top: 1px solid @color-border-light; font-size: @font-size-default; padding: @margin-small (@margin-big - .5); text-align: right; diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 933daad..853bf17 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; + border-bottom: 1px solid @color-border-light; padding: .8rem @margin-default @very-small-spacing; > p { diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less index bf8656e..f735dc6 100755 --- a/css/area_sidebar-search.less +++ b/css/area_sidebar-search.less @@ -1,78 +1,93 @@ -/** - * This file provides the design styles for the quick search. - * - * @author Jana Deutschlaender - */ - - -.search.main-sidebar { - form { - @icon-size: 40px; - - display: block; - margin: @margin-default 0; - - .no { - #qsearch__in { - width: 100%; - padding-left: 10px; - padding-right: (@icon-size + 10); - } - } - - input { - min-height: @icon-size; - box-sizing: border-box; - } - - button[type="submit"] { - .fontello(); - .hide-text-show-before(); - .icon-search(); - - position: relative; - width: @icon-size; - min-height: @icon-size; - overflow: visible; - background-image: none; - background-color: transparent; - border: solid 1px transparent; - border-right-color: @color-border; - color: @color-nav; - margin-left: -(@icon-size); - padding: 0; - transition: @transition color, @transition background-color, @transition border-color; - - &:hover, - &:focus, - &:active { - background-color: @button_color; - border: solid 1px @button_background; - color: @button_background; - - &::after { - background-color: @button_background; - } - } - - &::before { - width: 100%; - color: inherit; - font-size: 25px; - text-align: center; - margin: 0; - } - - &::after { - content: ''; - position: absolute; - top: 15%; - bottom: 15%; - width: 1px; - left: -1px; - background-color: @color-border; - transition: @transition background-color; - } - } - } -} +/** + * This file provides the design styles for the quick search. + * + * @author Jana Deutschlaender + */ + + +.search.main-sidebar { + + form { + @icon-size: 40px; + + display: block; + margin: 0 0 @margin-default; + + .no { + #qsearch__in { + width: 100%; + padding-left: 10px; + padding-right: (@icon-size + 10); + } + } + + input { + min-height: @icon-size; + box-sizing: border-box; + } + + button[type="submit"] { + .fontello(); + .hide-text-show-before(); + .icon-search(); + + position: relative; + width: @icon-size; + min-height: @icon-size; + overflow: visible; + background-image: none; + background-color: transparent; + border: solid 1px transparent; + border-right-color: @color-border; + color: @color-nav; + margin-left: -(@icon-size); + padding: 0; + transition: @transition color, @transition background-color, @transition border-color; + + &:hover, + &:focus, + &:active { + background-color: @button_color; + border: solid 1px @button_background; + color: @button_background; + + &::after { + background-color: @button_background; + } + } + + &::before { + width: 100%; + color: inherit; + font-size: 25px; + text-align: center; + margin: 0; + } + + &::after { + content: ''; + position: absolute; + top: 15%; + bottom: 15%; + width: 1px; + left: -1px; + background-color: @color-border; + transition: @transition background-color; + } + } + } +} + +.wide-content{ + .search.main-sidebar{ + form{ + .no { + #qsearch__in{ + width: 0; + padding: 0; + margin: 0; + } + } + } + } +} diff --git a/css/base.less b/css/base.less index bb8be28..68cb80d 100755 --- a/css/base.less +++ b/css/base.less @@ -17,6 +17,7 @@ @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__; @@ -34,6 +35,8 @@ @box-shadow: __box_shadow__; @box-shadow-colored: __box_shadow_colored__; +@th_background: __background_alt__; + /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* global vars */ diff --git a/css/base_design.less b/css/base_design.less index 144ccf7..8bc942e 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -10,6 +10,8 @@ html, body { background-color: @color-site-bg; } + + a { color: @color-link; } @@ -308,7 +310,7 @@ td { th { font-weight: bold; - background-color: @ini_background_alt; + background-color: @th_background; text-align: left; } diff --git a/css/base_structure.less b/css/base_structure.less index 4465db6..8ef1b17 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -121,9 +121,6 @@ .claim { .logo { - position: absolute; - bottom: 1em; - overflow: visible; img { height: 60px; @@ -155,24 +152,17 @@ .claim { .logo { - position: absolute; - bottom: 0; - height: 1px; - width: 100%; // fo IE - overflow: visible; + } .logo img { - max-width: 100%; - height: auto; + } } } .wide-content{ - .logo{ - visibility: hidden; - } + .content { .row > .col-xs-12{ width: auto; @@ -225,9 +215,7 @@ #dokuwiki__header { .logo { - width: 200px; - max-width: 33%; - margin: .8rem 0; + } } diff --git a/main.php b/main.php index d5c4157..12b2438 100755 --- a/main.php +++ b/main.php @@ -168,13 +168,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";