Mercurial > kallithea

changeset 6724:f46709f6fef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style: fix navbar collapsing and make styling more Bootstrappy
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 25 Jun 2017 18:49:04 +0200
parents ee3343f3658f
children b56aa0ea3531
files kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/templates/base/base.html
diffstat 3 files changed, 6 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css	Sun Jun 25 18:47:51 2017 +0200
+++ b/kallithea/public/css/contextbar.css	Sun Jun 25 18:49:04 2017 +0200
@@ -40,25 +40,6 @@
     color: #677a85;
 }
 
-#content #context-bar {
-    position: relative;
-    overflow: visible;
-    background-color: #577632;
-    padding: 0;
-    min-height: 36px;
-}
-
-#content #context-bar .navbar-header {
-    display: inline-block;
-    color: #FFF;
-    margin: 8px 15px 3px;
-    padding-bottom: 2px;
-}
-
-#content #context-bar > .navbar-header > .navbar-brand {
-    padding: 0;
-}
-
 nav.navbar #quick a,
 #content #context-bar,
 #content #context-bar a {
@@ -112,17 +93,15 @@
 
 nav.navbar #quick ul,
 #revision-changer,
-#context-pages,
 #context-pages ul {
-    background: #3b6998; /* Old browsers */
-    background: linear-gradient(to bottom, #577632 0%, #577632 100%); /* W3C */
+    background: #577632;
 }
 
 ul#context-actions {
     display: inline-block;
     float: right;
     border-radius: 4px;
-    background-image: linear-gradient(to bottom, #577632 0%, #577632 100%);
+    background: #577632;
 }
 
 #content ul#context-actions li {
@@ -190,11 +169,6 @@
     display: none;
 }
 
-#context-pages {
-    border-left: 1px solid rgba(0,0,0,0.1);
-    margin-right: 15px;
-}
-
 #content #context-pages .icon {
     margin-right: 5px;
 }
@@ -229,7 +203,7 @@
 #context-pages > li > a,
 #context-pages .select2-container .select2-choice .select2-chosen,
 x#context-pages .dropdown-menu a {
-    padding: 0px 10px 1px 10px;
+    padding: 0px 15px 1px 15px;
     line-height: 43px;
 }
 
--- a/kallithea/public/css/style.css	Sun Jun 25 18:47:51 2017 +0200
+++ b/kallithea/public/css/style.css	Sun Jun 25 18:49:04 2017 +0200
@@ -178,10 +178,9 @@
 nav.navbar .navbar-brand:hover,
 nav.navbar .navbar-brand {
     font-size: 20px;
+    padding-top: 12px;
     color: white !important;
-    float: left;
     height: 44px;
-    line-height: 44px;
 }
 
 nav.navbar ul#logged-user {
@@ -258,45 +257,11 @@
     padding: 0;
 }
 
-nav.navbar #home a:hover {
-    background-position: 0 -40px;
-}
-
-nav.navbar #logo {
-    float: left;
-    position: absolute;
-    padding-left: 10px;
-}
-
-nav.navbar #logo > .navbar-brand {
-    padding: 0 15px;
-}
-
 nav.navbar #logo > .navbar-brand > img {
-    padding-top: 5px;
+    margin-top: -9px;
     margin-right: 5px;
 }
 
-nav.navbar #logo h1 {
-    color: #FFF;
-    font-size: 20px;
-    margin: 12px 0 0 13px;
-    padding: 0;
-}
-
-nav.navbar #logo a {
-    color: #fff;
-    text-decoration: none;
-}
-
-nav.navbar #logo a:hover {
-    color: #bfe3ff;
-}
-
-nav.navbar #quick {
-    margin-right: 10px;
-}
-
 nav.navbar #quick li .icon {
     padding-left: 10px;
     display: inline;
@@ -319,11 +284,6 @@
     font-weight: bold;
 }
 
-#content nav.navbar .navbar-brand {
-    height: inherit;
-    line-height: inherit;
-}
-
 .groups_breadcrumbs a {
     color: #fff;
 }
--- a/kallithea/templates/base/base.html	Sun Jun 25 18:47:51 2017 +0200
+++ b/kallithea/templates/base/base.html	Sun Jun 25 18:49:04 2017 +0200
@@ -121,7 +121,7 @@
         <span class="icon-bar"></span>
       </button>
     </div>
-    <ul id="context-pages" class="nav navbar-nav navbar-right">
+    <ul id="context-pages" class="nav navbar-nav navbar-right navbar-collapse collapse">
         <li class="${'active' if current == 'summary' else ''}" data-context="summary"><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-doc-text"></i> ${_('Summary')}</a></li>
         %if rev:
         <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>