Changeset - 20830dfe3ed8
Parent rev.
Child rev.
[Not reviewed]
default
0 13 0
Mads Kiilerich - 9 years ago 2016-10-20 20:04:28
madski@unity3d.com
style: adjust button sizes to be more like Bootstrap and change some btn-sm to btn-xs

Based on work by Dominik Ruf.
13 files changed with 23 insertions and 22 deletions:
kallithea/public/css/style.css
3
2
kallithea/templates/admin/admin.html
1
1
kallithea/templates/admin/gists/edit.html
2
2
kallithea/templates/admin/gists/index.html
1
1
kallithea/templates/admin/repo_groups/repo_group_edit.html
1
1
kallithea/templates/admin/repo_groups/repo_groups.html
1
1
kallithea/templates/admin/repos/repos.html
1
1
kallithea/templates/admin/users/users.html
1
1
kallithea/templates/files/files_edit.html
2
2
kallithea/templates/index_base.html
5
5
kallithea/templates/journal/journal.html
1
1
kallithea/templates/pullrequests/pullrequest_show.html
1
1
kallithea/templates/pullrequests/pullrequest_show_all.html
3
3
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -3123,12 +3123,13 @@ div.gravatar img {
 
    outline: none;
 
    margin: 0px 3px 3px 0px;
 
    border-radius: 4px 4px 4px 4px !important;
 
    cursor: pointer !important;
 
    padding: 3px 3px 3px 3px;
 
    display: inline-block;
 
    white-space: nowrap;
 
}
 

			




	
	
	
		
 
ul.nav-stacked {

			




	
	
	
		
 
    margin: 20px;

			




	
	
	
		
 
    color: #393939;

			




	
	
	
		
 
    font-weight: 700;

			




	
	
		
 
@@ -3162,17 +3163,17 @@ input.btn {

			




	
	
	
		
 
input[disabled].btn,

			




	
	
	
		
 
.btn.disabled {

			




	
	
	
		
 
    color: #999;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.btn.btn-sm {

			




	
	
	
		
 
    padding: 2px 6px;

			




	
	
	
		
 
    padding: 3px 8px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.btn.btn-xs {

			




	
	
	
		
 
    padding: 0px 4px;

			




	
	
	
		
 
    padding: 1px 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.btn:focus {

			




	
	
	
		
 
    outline: none;

			




	
	
	
		
 
}

			




	
	
	
		
 
.btn:hover {

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/admin.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,13 +6,13 @@

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    <form id="filter_form">

			




	
	
	
		
 
    <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/>

			




	
	
	
		
 
    <span class="tooltip" title="${h.journal_filter_help()}">?</span>

			




	
	
	
		
 
    <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs" style="padding:0px 2px 0px 2px;margin:0px"/>

			




	
	
	
		
 
    <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>

			




	
	
	
		
 
    ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)}

			




	
	
	
		
 
    </form>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/gists/edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -138,14 +138,14 @@

			




	
	
	
		
 
                    });

			




	
	
	
		
 
                </script>

			




	
	
	
		
 

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 

			




	
	
	
		
 
            <div style="padding-top: 5px">

			




	
	
	
		
 
            ${h.submit('update',_('Update Gist'),class_="btn btn-success btn-xs")}

			




	
	
	
		
 
            <a class="btn btn-default btn-xs" href="${h.url('gist', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a>

			




	
	
	
		
 
            ${h.submit('update',_('Update Gist'),class_="btn btn-success")}

			




	
	
	
		
 
            <a class="btn btn-default" href="${h.url('gist', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          ${h.end_form()}

			




	
	
	
		
 
          <script>

			




	
	
	
		
 
              $('#update').on('click', function(e){

			




	
	
	
		
 
                  e.preventDefault();

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/gists/index.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,13 +31,13 @@

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="panel-heading">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




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

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
             <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a>

			




	
	
	
		
 
             <a href="${h.url('new_gist')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Create New Gist')}</a>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %if c.gists_pager.item_count>0:

			




	
	
	
		
 
        % for gist in c.gists_pager:

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repo_groups/repo_group_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -15,13 +15,13 @@

			




	
	
	
		
 
    &raquo; ${h.link_to(c.repo_group.name,h.url('repos_group_home',group_name=c.repo_group.group_name))}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_side_links()">

			




	
	
	
		
 
    <ul class="links">

			




	
	
	
		
 
      <li>

			




	
	
	
		
 
          <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Child Group')}</a>

			




	
	
	
		
 
          <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Child Group')}</a>

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
    </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('admin')}

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repo_groups/repo_groups.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,13 +19,13 @@

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="panel-heading">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            %if h.HasPermissionAny('hg.admin')():

			




	
	
	
		
 
             <li>

			




	
	
	
		
 
               <a href="${h.url('new_repos_group')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>

			




	
	
	
		
 
               <a href="${h.url('new_repos_group')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>

			




	
	
	
		
 
             </li>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    <div class="table">

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repos.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,13 +16,13 @@

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="panel-heading">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
         %if h.HasPermissionAny('hg.admin','hg.create.repository')():

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
            <a href="${h.url('new_repo')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a>

			




	
	
	
		
 
            <a href="${h.url('new_repo')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
         %endif

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <table id="datatable_list_wrap"></table>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/users/users.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -17,13 +17,13 @@

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="panel-heading">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
            <a href="${h.url('new_user')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add User')}</a>

			




	
	
	
		
 
            <a href="${h.url('new_user')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add User')}</a>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <table id="datatable_list_wrap"></table>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -61,14 +61,14 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
                <pre id="editor_pre"></pre>

			




	
	
	
		
 
                <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>

			




	
	
	
		
 
                <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>

			




	
	
	
		
 
                <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="text-align: left;padding-top: 5px">

			




	
	
	
		
 
            ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")}

			




	
	
	
		
 
            ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
            ${h.submit('commit',_('Commit Changes'),class_="btn btn-success")}

			




	
	
	
		
 
            ${h.reset('reset',_('Reset'),class_="btn btn-default")}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/index_base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,25 +11,25 @@

			




	
	
	
		
 
                    create_on_write = h.HasPermissionAny('hg.create.write_on_repogroup.true')()

			




	
	
	
		
 
                    group_admin = h.HasRepoGroupPermissionAny('group.admin')(gr_name, 'can write into group index page')

			




	
	
	
		
 
                    group_write = h.HasRepoGroupPermissionAny('group.write')(gr_name, 'can write into group index page')

			




	
	
	
		
 
                %>

			




	
	
	
		
 
                %if h.HasPermissionAny('hg.admin','hg.create.repository')() or (group_admin or (group_write and create_on_write)):

			




	
	
	
		
 
                  %if c.group:

			




	
	
	
		
 
                        <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a>

			




	
	
	
		
 
                        <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a>

			




	
	
	
		
 
                        %if h.HasPermissionAny('hg.admin')() or h.HasRepoGroupPermissionAny('group.admin')(c.group.group_name):

			




	
	
	
		
 
                            <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>

			




	
	
	
		
 
                            <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                  %else:

			




	
	
	
		
 
                    <a href="${h.url('new_repo')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a>

			




	
	
	
		
 
                    <a href="${h.url('new_repo')}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a>

			




	
	
	
		
 
                    %if h.HasPermissionAny('hg.admin')():

			




	
	
	
		
 
                        <a href="${h.url('new_repos_group')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>

			




	
	
	
		
 
                        <a href="${h.url('new_repos_group')}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if c.group and h.HasRepoGroupPermissionAny('group.admin')(c.group.group_name):

			




	
	
	
		
 
                    <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-default btn-sm"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a>

			




	
	
	
		
 
                    <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-default btn-xs"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                </li>

			




	
	
	
		
 
              </ul>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <!-- end box / title -->

			




        

    


    
    

    

        

                

                    kallithea/templates/journal/journal.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -5,13 +5,13 @@

			




	
	
	
		
 
</%block>

			




	
	
	
		
 
<%def name="breadcrumbs()">

			




	
	
	
		
 
    <h5>

			




	
	
	
		
 
    <form id="filter_form">

			




	
	
	
		
 
    <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>

			




	
	
	
		
 
    <span class="tooltip" title="${h.journal_filter_help()}">?</span>

			




	
	
	
		
 
    <input type='submit' value="${_('Filter')}" class="btn btn-default btn-sm" style="padding:0px 2px 0px 2px;margin:0px"/>

			




	
	
	
		
 
    <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>

			




	
	
	
		
 
    ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}

			




	
	
	
		
 
    </form>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
    </h5>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%block name="header_menu">

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -35,13 +35,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field pr-not-edit" style="min-height:37px">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
            <label>${_('Description')}:</label>

			




	
	
	
		
 
            %if editable:

			




	
	
	
		
 
            <div style="margin: 5px">

			




	
	
	
		
 
              <a class="btn btn-default btn-sm" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>

			




	
	
	
		
 
              <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
          </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show_all.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -26,20 +26,20 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
    <div class="panel-heading">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
          <li>

			




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

			




	
	
	
		
 
              <span>

			




	
	
	
		
 
                  <a id="open_new_pr" class="btn btn-success btn-sm" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a>

			




	
	
	
		
 
                  <a id="open_new_pr" class="btn btn-success btn-xs" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a>

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
              <span>

			




	
	
	
		
 
                %if c.from_:

			




	
	
	
		
 
                    <a class="btn btn-default btn-sm" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>

			




	
	
	
		
 
                    <a class="btn btn-default btn-xs" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                    <a class="btn btn-default btn-sm" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>

			




	
	
	
		
 
                    <a class="btn btn-default btn-xs" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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.