diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css --- a/kallithea/public/css/contextbar.css +++ b/kallithea/public/css/contextbar.css @@ -1,16 +1,6 @@ /** * Stylesheets for the context bar */ -nav.navbar #quick a, -#content #context-bar, -#content #context-bar a { - color: #FFFFFF; -} -nav.navbar #quick a:hover, -#content #context-bar a:hover { - text-decoration: none; - background: inherit; -} nav.navbar #quick ul, #context-pages ul { background: #577632; @@ -34,9 +24,6 @@ nav.navbar #quick li a.menu_link:focus, display: none; } -.nav .open > a { - background: inherit !important; -} nav.navbar #quick > li > a, nav.navbar #quick .select2-container .select2-choice .select2-chosen, #context-pages > ul > li > a, diff --git a/kallithea/public/less/kallithea-variables.less b/kallithea/public/less/kallithea-variables.less --- a/kallithea/public/less/kallithea-variables.less +++ b/kallithea/public/less/kallithea-variables.less @@ -13,3 +13,12 @@ @link-hover-color: darken(@kallithea-theme-main-color, 20.0%); @btn-default-bg: #E7E7E7; @font-family-monospace: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; +@navbar-inverse-color: @kallithea-theme-inverse-color; +@navbar-inverse-bg: @kallithea-theme-main-color; +@navbar-inverse-border: @kallithea-theme-main-color; +@navbar-inverse-link-color: @kallithea-theme-inverse-color; +@navbar-inverse-link-hover-bg: tint(@kallithea-theme-main-color, 15.0%); +@navbar-inverse-link-active-bg: @navbar-inverse-link-hover-bg; +@navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg; +@navbar-inverse-toggle-border-color:@kallithea-theme-main-color; +@dropdown-link-color: @navbar-inverse-color; diff --git a/kallithea/public/less/style.less b/kallithea/public/less/style.less --- a/kallithea/public/less/style.less +++ b/kallithea/public/less/style.less @@ -58,21 +58,14 @@ a.permalink { .navbar-inverse { border: none; } -.navbar-inverse .navbar-nav > .active > a, -.navbar-inverse .navbar-nav > .active > a:hover, -.navbar-inverse .navbar-nav > .active > a:focus { - background-color: inherit; -} nav.navbar .navbar-brand:hover, nav.navbar .navbar-brand { font-size: 20px; padding-top: 12px; - color: white !important; height: 44px; } nav.navbar { min-height: 44px; - background-color: #577632; } /* logo */ @@ -197,16 +190,11 @@ div.panel.panel-default > div.panel-head } #footer { - background-color: #577632; margin-bottom: 0; } #footer > span { - color: #FFF; font-weight: 700; } -#footer .navbar-link { - color: #FFF; -} #login .panel-body .icon-lock { font-size: 100px; @@ -295,8 +283,8 @@ div.panel.panel-default > div.panel-head #quick_login div.form div.form-group { padding: 5px; } -#quick_login div.form div.form-group > label { - color: #fff; +#quick_login :not(input) { + color: @kallithea-theme-inverse-color; padding-bottom: 3px; } #quick_login div.form div.form-group > div input {