Changeset - 2ce1f4cd87d8
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
domruf - 8 years ago 2017-07-18 22:07:44
dominikruf@gmail.com
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.
2 files changed with 9 insertions and 19 deletions:
kallithea/public/css/style.css
2
12
kallithea/templates/base/base.html
7
7
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -2175,56 +2175,46 @@ div#overview {
 

			




	
	
	
		
 
#content #left #menu ul.closed,

			




	
	
	
		
 
#content #left #menu li ul.collapsed,

			




	
	
	
		
 
.yui-tt-shadow {

			




	
	
	
		
 
    display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #left #menu ul.opened,

			




	
	
	
		
 
#content #left #menu li ul.expanded {

			




	
	
	
		
 
    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;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.branch-switcher .select2-choice,

			




	
	
	
		
 
.repo-switcher .select2-choice {

			




	
	
	
		
 
    height: 100%;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.select2-container.form-control {

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    border: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.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;

			




	
	
	
		
 
    color: #FFFFFF !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.branch-switcher .select2-arrow,

			




	
	
	
		
 
.repo-switcher .select2-arrow {

			




	
	
	
		
 
    display: none !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.branch-switcher-dropdown.select2-drop.select2-drop-active,

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -127,27 +127,27 @@

			




	
	
	
		
 
        <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>

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
        <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        <li class="${'active' if current == 'files' else ''}" data-context="files"><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-doc-inv"></i> ${_('Files')}</a></li>

			




	
	
	
		
 
        <li class="${'active' if current == 'switch-to' else ''}" data-context="switch-to">

			




	
	
	
		
 
          <input id="branch_switcher" name="branch_switcher" type="hidden">

			




	
	
	
		
 
        </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):

			




	
	
	
		
 
                   <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i> ${_('Settings')}</a></li>

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
              %if c.db_repo.fork:

			




	
	
	
		
 
               <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">

			




	
	
	
		
 
                   <i class="icon-git-compare"></i> ${_('Compare Fork')}</a></li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i> ${_('Compare')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>

			




	
	
		
 
@@ -180,25 +180,25 @@

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </a>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
    </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </nav>

			




	
	
	
		
 
  <script type="text/javascript">

			




	
	
	
		
 
    $(document).ready(function() {

			




	
	
	
		
 
      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) {

			




	
	
	
		
 
              return obj.text;

			




	
	
	
		
 
          },

			




	
	
	
		
 
          formatSelection: function(obj) {

			




	
	
	
		
 
              return obj.text;

			




	
	
	
		
 
          },

			




	
	
	
		
 
          formatNoMatches: function(term) {

			




	
	
	
		
 
              return ${h.jshtml(_('No matches found'))};

			




	
	
	
		
 
          },

			




	
	
	
		
 
          escapeMarkup: function(m) {

			




	
	
		
 
@@ -299,44 +299,44 @@

			




	
	
	
		
 
          <i class="icon-book"></i> ${_('Journal')}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
      <li class="${'active' if current == 'journal' else ''}">

			




	
	
	
		
 
        <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">

			




	
	
	
		
 
          <i class="icon-book"></i> ${_('Public journal')}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
    %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>

			




	
	
	
		
 
            <li><a href="${h.url('gists')}"><i class="icon-globe"></i> ${_('All Public Gists')}</a></li>

			




	
	
	
		
 
            %if request.authuser.username != 'default':

			




	
	
	
		
 
              <li><a href="${h.url('gists', public=1)}"><i class="icon-user"></i> ${_('My Public Gists')}</a></li>

			




	
	
	
		
 
              <li><a href="${h.url('gists', private=1)}"><i class="icon-keyhole-circled"></i> ${_('My Private Gists')}</a></li>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
    <li class="${'active' if current == 'search' else ''}">

			




	
	
	
		
 
        <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">

			




	
	
	
		
 
          <i class="icon-search"></i> ${_('Search')}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    % 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>

			




	
	
	
		
 
    % elif request.authuser.repositories_admin or request.authuser.repository_groups_admin or request.authuser.user_groups_admin:

			




	
	
	
		
 
    <li class="${'active' if current == 'admin' else ''} dropdown">

			




	
	
	
		
 
        <a class="menu_link dropdown-toggle" data-toggle="dropdown" role="button" title="${_('Admin')}">

			




	
	
	
		
 
          <i class="icon-gear"></i> ${_('Admin')}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
        ${admin_menu_simple(request.authuser.repositories_admin,

			




	
	
	
		
 
                            request.authuser.repository_groups_admin,

			




	
	
	
		
 
                            request.authuser.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}

			




	
	
	
		
 
    </li>

			




	
	
		
 
@@ -361,25 +361,25 @@

			




	
	
	
		
 
          href="#"

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      >

			




	
	
	
		
 
          ${h.gravatar_div(request.authuser.email, size=20, div_class="icon")}

			




	
	
	
		
 
          %if request.authuser.username != 'default':

			




	
	
	
		
 
            <span class="menu_link_user">${request.authuser.username}</span>

			




	
	
	
		
 
            %if c.unread_notifications != 0:

			




	
	
	
		
 
              <span class="badge">${c.unread_notifications}</span>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          %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">

			




	
	
	
		
 
        <div id="quick_login" role="form" aria-describedby="quick_login_h" aria-hidden="true" class="container-fluid">

			




	
	
	
		
 
          %if request.authuser.username == 'default' or request.authuser.user_id is None:

			




	
	
	
		
 
            ${h.form(h.url('login_home', came_from=request.path_qs), class_='form clearfix')}

			




	
	
	
		
 
                <h4 id="quick_login_h">${_('Login to Your Account')}</h4>

			




	
	
	
		
 
                <label>

			




	
	
	
		
 
                    ${_('Username')}:

			




	
	
	
		
 
                    ${h.text('username',class_='form-control')}

			




	
	
	
		
 
                </label>

			




	
	
	
		
 
                <label>

			




	
	
		
 
@@ -445,25 +445,25 @@

			




	
	
	
		
 
                        tmpl += '<i class="icon-globe"></i> ';

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                    tmpl += '</span>';

			




	
	
	
		
 
                }

			




	
	
	
		
 
                if(obj_dict && state.type == 'group'){

			




	
	
	
		
 
                        tmpl += '<i class="icon-folder"></i> ';

			




	
	
	
		
 
                }

			




	
	
	
		
 
                tmpl += state.text;

			




	
	
	
		
 
                return tmpl;

			




	
	
	
		
 
            }

			




	
	
	
		
 

			




	
	
	
		
 
            $("#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,

			




	
	
	
		
 
                formatSelection: format,

			




	
	
	
		
 
                formatNoMatches: function(term){

			




	
	
	
		
 
                    return ${h.jshtml(_('No matches found'))};

			




	
	
	
		
 
                },

			




	
	
	
		
 
                containerCssClass: "repo-switcher",

			




	
	
	
		
 
                dropdownCssClass: "repo-switcher-dropdown",

			




	
	
	
		
 
                escapeMarkup: function(m){

			




	
	
	
		
 
                    // don't escape our custom placeholder

			




	
	
	
		
 
                    if(m.substr(0,29) == '<i class="icon-database"></i>'){

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.