Mercurial > kallithea

changeset 6587:e075f2cc4f8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style: avoid conflict between navbar 'caret' and plain bootstrap 'caret'
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 11 Apr 2017 01:51:54 +0200
parents 8c686b00ebae
children 0452c45a546c
files kallithea/public/css/style.css kallithea/templates/base/base.html
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Tue Apr 11 01:49:01 2017 +0200
+++ b/kallithea/public/css/style.css	Tue Apr 11 01:51:54 2017 +0200
@@ -3117,7 +3117,7 @@
     display: block !important;
 }
 
-.caret:after {
+.navbar-caret:after {
     font-family: 'kallithea';
     content: ' \23f7';           /* triangle-down */
 }
--- a/kallithea/templates/base/base.html	Tue Apr 11 01:49:01 2017 +0200
+++ b/kallithea/templates/base/base.html	Tue Apr 11 01:51:54 2017 +0200
@@ -134,9 +134,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="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="navbar-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="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="navbar-caret"></i></a>
              %endif
           <ul class="dropdown-menu" role="menu" aria-hidden="true">
              %if h.HasRepoPermissionLevel('admin')(c.repo_name):
@@ -185,7 +185,7 @@
       var bcache = {};
 
       $("#branch_switcher").select2({
-          placeholder: '<span class="navbar-text"> <i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="caret"></span></span>',
+          placeholder: '<span class="navbar-text"> <i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="navbar-caret"></span></span>',
           dropdownAutoWidth: true,
           sortResults: prefixFirstSort,
           formatResult: function(obj) {
@@ -304,7 +304,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="caret"></span>
+          <i class="icon-clippy"></i> ${_('Gists')} <span class="navbar-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>
@@ -323,7 +323,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="caret"></span>
+          <i class="icon-gear"></i> ${_('Admin')} <span class="navbar-caret"></span>
         </a>
         ${admin_menu()}
       </li>
@@ -449,7 +449,7 @@
             }
 
             $("#repo_switcher").select2({
-                placeholder: '<span class="navbar-text"><i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="caret"></span></span>',
+                placeholder: '<span class="navbar-text"><i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="navbar-caret"></span></span>',
                 dropdownAutoWidth: true,
                 sortResults: prefixFirstSort,
                 formatResult: format,