Mercurial > kallithea

changeset 6853:2ce1f4cd87d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
navbar: use Bootstrap 'caret' class instead of our own 'navbar-caret' This mostly reverses e075f2cc4f8c - now we use so much Bootstrap that it no longer is an issue. Note: This icon is smaller than the old one.
author domruf <dominikruf@gmail.com>
date Tue, 18 Jul 2017 22:07:44 +0200
parents ca4ab5047f74
children ed3fc5a5f4e8
files kallithea/public/css/style.css kallithea/templates/base/base.html
diffstat 2 files changed, 9 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Mon Jun 26 20:47:49 2017 +0200
+++ b/kallithea/public/css/style.css	Tue Jul 18 22:07:44 2017 +0200
@@ -2184,16 +2184,6 @@
     display: block !important;
 }
 
-.navbar-caret {
-    margin-top: -2px;
-    display: inline-block;
-}
-
-.navbar-caret:after {
-    font-family: 'kallithea';
-    content: ' \23f7';           /* triangle-down */
-}
-
 #context-bar .select2-container .select2-choice .select2-chosen,
 nav.navbar #quick .select2-container .select2-choice .select2-chosen {
     margin-right: 0;
@@ -2212,10 +2202,10 @@
 
 .branch-switcher .select2-container,
 .branch-switcher .select2-choice,
-.branch-switcher .select2-choice span,
+.branch-switcher .select2-choice > span,
 .repo-switcher .select2-container,
 .repo-switcher .select2-choice,
-.repo-switcher .select2-choice span {
+.repo-switcher .select2-choice > span {
     background: transparent !important;
     border: 0 !important;
     box-shadow: none !important;
--- a/kallithea/templates/base/base.html	Mon Jun 26 20:47:49 2017 +0200
+++ b/kallithea/templates/base/base.html	Tue Jul 18 22:07:44 2017 +0200
@@ -136,9 +136,9 @@
         </li>
         <li class="${'active' if current == 'options' else ''} dropdown" data-context="options">
              %if h.HasRepoPermissionLevel('admin')(c.repo_name):
-               <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="navbar-caret"></i></a>
+               <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="caret"></i></a>
              %else:
-               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="navbar-caret"></i></a>
+               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="caret"></i></a>
              %endif
           <ul class="dropdown-menu" role="menu" aria-hidden="true">
              %if h.HasRepoPermissionLevel('admin')(c.repo_name):
@@ -189,7 +189,7 @@
       var bcache = {};
 
       $("#branch_switcher").select2({
-          placeholder: '<i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="navbar-caret"></span>',
+          placeholder: '<i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="caret"></span>',
           dropdownAutoWidth: true,
           sortResults: prefixFirstSort,
           formatResult: function(obj) {
@@ -308,7 +308,7 @@
     %endif
       <li class="${'active' if current == 'gists' else ''} dropdown">
         <a class="menu_link dropdown-toggle" data-toggle="dropdown" role="button" title="${_('Show public gists')}"  href="${h.url('gists')}">
-          <i class="icon-clippy"></i> ${_('Gists')} <span class="navbar-caret"></span>
+          <i class="icon-clippy"></i> ${_('Gists')} <span class="caret"></span>
         </a>
           <ul class="dropdown-menu" role="menu">
             <li><a href="${h.url('new_gist', public=1)}"><i class="icon-paste"></i> ${_('Create New Gist')}</a></li>
@@ -327,7 +327,7 @@
     % if h.HasPermissionAny('hg.admin')('access admin main page'):
       <li class="${'active' if current == 'admin' else ''} dropdown">
         <a class="menu_link dropdown-toggle" data-toggle="dropdown" role="button" title="${_('Admin')}" href="${h.url('admin_home')}">
-          <i class="icon-gear"></i> ${_('Admin')} <span class="navbar-caret"></span>
+          <i class="icon-gear"></i> ${_('Admin')} <span class="caret"></span>
         </a>
         ${admin_menu()}
       </li>
@@ -370,7 +370,7 @@
           %else:
               <span>${_('Not Logged In')}</span>
           %endif
-          <i class="navbar-caret"></i>
+          <i class="caret"></i>
       </a>
 
       <div class="dropdown-menu user-menu" role="menu">
@@ -454,7 +454,7 @@
             }
 
             $("#repo_switcher").select2({
-                placeholder: '<i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="navbar-caret"></span>',
+                placeholder: '<i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="caret"></span>',
                 dropdownAutoWidth: true,
                 sortResults: prefixFirstSort,
                 formatResult: format,