Mercurial > kallithea
changeset 6832:689c346e39be
contextbar: fix navbar markup
This makes the contextbar markup more consistent with the Bootstrap
documentation at https://getbootstrap.com/docs/3.3/components/#navbar and with
the markup of the main navbar.
This fixes a minor UI issue on small devices where the navbar-collapse border
would show up as a too wide and too low black line.
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Sun, 06 Aug 2017 20:39:33 +0200 |
| parents | 54ce462a0824 |
| children | 3c1cdd1c1736 |
| files | kallithea/public/css/contextbar.css kallithea/templates/base/base.html |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css Mon Jul 03 20:18:57 2017 +0200 +++ b/kallithea/public/css/contextbar.css Sun Aug 06 20:39:33 2017 +0200 @@ -200,7 +200,7 @@ nav.navbar #quick > li > a, nav.navbar #quick .select2-container .select2-choice .select2-chosen, -#context-pages > li > a, +#context-pages > ul > li > a, #context-pages .select2-container .select2-choice .select2-chosen, x#context-pages .dropdown-menu a { padding: 0px 15px 1px 15px;
--- a/kallithea/templates/base/base.html Mon Jul 03 20:18:57 2017 +0200 +++ b/kallithea/templates/base/base.html Sun Aug 06 20:39:33 2017 +0200 @@ -94,6 +94,7 @@ <% rev = None if rev == 'tip' else rev %> <!--- CONTEXT BAR --> <nav id="context-bar" class="navbar navbar-inverse"> + <div class="container-fluid"> <div class="navbar-header"> <div class="navbar-brand"> ${repotag(c.db_repo)} @@ -121,7 +122,8 @@ <span class="icon-bar"></span> </button> </div> - <ul id="context-pages" class="nav navbar-nav navbar-right navbar-collapse collapse"> + <div id="context-pages" class="navbar-collapse collapse"> + <ul class="nav navbar-nav navbar-right"> <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> @@ -179,6 +181,8 @@ </a> </li> </ul> + </div> + </div> </nav> <script type="text/javascript"> $(document).ready(function() {