# HG changeset patch # User Mads Kiilerich # Date 2017-12-17 02:15:17 # Node ID 82e6b481e2124b38d7891fabc82a493ea123a5e7 # Parent 25e079891ff5db88d777dece35c18ca34ff9f8c3 less: move the remaining parts of contextbar.css to style.css diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css deleted file mode 100644 --- a/kallithea/public/css/contextbar.css +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Stylesheets for the context bar - */ -.repo-switcher-dropdown.select2-drop.select2-drop-active .select2-results .select2-highlighted, -ul.dropdown-menu li a:focus, -nav.navbar #quick li:hover, -#quick_login > .pull-right .list-group-item:hover, -#context-pages li:hover, -nav.navbar #quick li.active, -nav.navbar #quick li a.menu_link:focus, -#context-pages li.active { - background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */ -} -#quick_login > .pull-right .list-group-item { - background-color: #577632; - border: 0; -} -#content #context-pages .follow .show-following, -#content #context-pages .following .show-follow { - display: none; -} - -nav.navbar #quick > li > a, -nav.navbar #quick .select2-container .select2-choice .select2-chosen, -#context-pages > ul > li > a, -#context-pages .select2-container .select2-choice .select2-chosen { - padding: 0px 15px 1px 15px; - line-height: 43px; -} 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 @@ -1035,3 +1035,31 @@ div.annotatediv { background-color: #FFFFBE !important; } .linenos a { text-decoration: none; } + +/* Stylesheets for the context bar */ +.repo-switcher-dropdown.select2-drop.select2-drop-active .select2-results .select2-highlighted, +ul.dropdown-menu li a:focus, +nav.navbar #quick li:hover, +#quick_login > .pull-right .list-group-item:hover, +#context-pages li:hover, +nav.navbar #quick li.active, +nav.navbar #quick li a.menu_link:focus, +#context-pages li.active { + background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */ +} +#quick_login > .pull-right .list-group-item { + background-color: #577632; + border: 0; +} +#content #context-pages .follow .show-following, +#content #context-pages .following .show-follow { + display: none; +} + +nav.navbar #quick > li > a, +nav.navbar #quick .select2-container .select2-choice .select2-chosen, +#context-pages > ul > li > a, +#context-pages .select2-container .select2-choice .select2-chosen { + padding: 0px 15px 1px 15px; + line-height: 43px; +} diff --git a/kallithea/templates/base/root.html b/kallithea/templates/base/root.html --- a/kallithea/templates/base/root.html +++ b/kallithea/templates/base/root.html @@ -11,7 +11,6 @@ ## CSS ### - <%block name="css_extra"/> diff --git a/kallithea/templates/errors/error_document.html b/kallithea/templates/errors/error_document.html --- a/kallithea/templates/errors/error_document.html +++ b/kallithea/templates/errors/error_document.html @@ -11,7 +11,6 @@ -