kallithea Changeset - 03746b8cd5c9

Changeset - 03746b8cd5c9

Parent rev.

Child rev.

[Not reviewed]

default

0 9 0

Mads Kiilerich - 9 years ago 2017-02-16 02:43:11
mads@kiilerich.com

style: use more Bootstrap pull-left and pull-right

Based on work by Dominik Ruf.

9 files changed with 21 insertions and 25 deletions:

kallithea/templates/admin/gists/show.html

kallithea/templates/base/perms_summary.html

kallithea/templates/changeset/changeset.html

kallithea/templates/changeset/diff_block.html

kallithea/templates/compare/compare_cs.html

kallithea/templates/files/files_history_box.html

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/templates/admin/gists/show.html

➞

Show inline comments

@@ @@ -50,13 +50,13 @@ @@
                         </div>
                         %if h.HasPermissionAny('hg.admin')() or c.gist.owner_id == request.authuser.user_id:
-                        <div style="float:right">
+                        <div class="pull-right">
                             ${h.form(url('gist_delete', gist_id=c.gist.gist_id))}
                                 ${h.submit('remove_gist', _('Delete'),class_="btn btn-danger btn-xs",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")}
                             ${h.end_form()}
                         </div>
                         %endif
-                        <div class="buttons">
+                        <div class="pull-right">
                           ## only owner should see that
                           %if h.HasPermissionAny('hg.admin')() or c.gist.owner_id == request.authuser.user_id:
                             ${h.link_to(_('Edit'),h.url('edit_gist', gist_id=c.gist.gist_access_id),class_="btn btn-default btn-xs")}
@@ @@ -79,7 +79,7 @@ @@
                 <div id="${h.FID('G', file.path)}" class="stats" style="border-bottom: 1px solid #DDD;padding: 8px 14px;">
                     <a href="${c.gist.gist_url()}">¶</a>
                     <b style="margin:0px 0px 0px 4px">${h.safe_unicode(file.path)}</b>
-                    <div style="float:right; margin: -5px">
+                    <div class="pull-right" style="margin: -5px">
                        ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-default btn-xs")}
                     </div>
                 </div>

kallithea/templates/base/perms_summary.html

➞

Show inline comments

@@ @@ -9,7 +9,7 @@ @@
         <div class="perms_section_head">
             <h4>${section.replace("_"," ").capitalize()}</h4>
             %if section != 'global':
-              <div style="float: right">
+              <div class="pull-right">
                 ${_('Show')}:
                 <label>${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'none'})}<span class="perm_tag none">${_('None')}</span></label>
                 <label>${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'read'})}<span class="perm_tag read">${_('Read')}</span></label>

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -31,7 +31,7 @@ ${self.repo_context_bar('changelog', c.c @@
   <div class="panel-body">
     <div>
         <div class="diffblock">
             <div class="parents">
+            <div class="parents pull-left">
                 <div id="parent_link" class="changeset_hash">
                     <i style="color:#036185" class="icon-left-open"></i> <a href="#">${_('Parent rev.')}</a>
                 </div>
@@ @@ -43,7 +43,7 @@ ${self.repo_context_bar('changelog', c.c @@
                 </div>
             </div>
             <div class="code-header banner">
+            <div class="pull-left code-header banner">
                 <div class="pull-left changeset-status-container">
                     %if c.statuses:
                         <span class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></span>
@@ @@ -63,7 +63,7 @@ ${self.repo_context_bar('changelog', c.c @@
                   ${c.ignorews_url(request.GET)}
                   ${c.context_url(request.GET)}
                 </div>
-                <div class="comments-number" style="float:right;padding-right:5px">
+                <div class="text-right pull-right comments-number" style="padding-right:5px">
                     ${comment.comment_count(c.inline_cnt, len(c.comments))}
                 </div>
             </div>
@@ @@ -71,7 +71,7 @@ ${self.repo_context_bar('changelog', c.c @@
         <div id="changeset_content">
             <div class="form-group container">
                 <div class="right">
+                <div class="pull-right">
                     <span class="logtags">
                         %if len(c.changeset.parents)>1:
                         <span class="mergetag">${_('Merge')}</span>

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -70,7 +70,7 @@ @@
                   ${c.ignorews_url(request.GET, url_fid)}
                   ${c.context_url(request.GET, url_fid)}
                 </div>
-                <span style="float:right;margin-top:-3px">
+                <span class="pull-right" style="margin-top:-3px">
                     <label>
                         ${_('Show inline comments')}
                         ${h.checkbox('checkbox-show-inline-' + id_fid, checked="checked",class_="show-inline-comments",**{'data-id_for':id_fid})}

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -79,7 +79,7 @@ @@
             <i class="icon-align-left" style="color:#999"></i>
         </td>
         <td>
-            <div style="float: right; margin-top: -4px;">
+            <div class="pull-right" style="margin-top: -4px;">
                 %for tag in cs.tags:
                     <span class="tagtag" title="${_('Tag %s') % tag}">
                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

kallithea/templates/files/files_history_box.html

➞

Show inline comments

 <div class="file_author" style="clear:both">
     <div class="item">${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</div>
     %for email, user in c.authors:
-      <div class="contributor" style="float:left" data-toggle="tooltip" title="${user}">
+      <div class="contributor pull-left" data-toggle="tooltip" title="${user}">
         ${h.gravatar_div(email, size=20, div_style="margin:1px")}
       </div>
     %endfor

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -84,15 +84,11 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
         </div>
         <div style="clear:both;padding: 0 0 30px 0;"></div>
         <div style="float:left;padding:0px 30px 30px 30px">
         <div>
            <h4>${_('Changesets')}</h4>
            ## overview pulled by ajax
-           <div style="float:left" id="pull_request_overview"></div>
            <div id="pull_request_overview"></div>
         </div>
         <div style="clear:both;"></div>
     </div>
     ${h.end_form()}

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -23,7 +23,7 @@ ${self.repo_context_bar('showpullrequest @@
   </div>
   ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form',class_='panel-body')}
-    <div class="form pr-box" style="float: left">
     <div class="form pr-box">
       <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">
         <h3>
           ${_('Title')}: ${c.pull_request.title}
@@ @@ -65,7 +65,7 @@ ${self.repo_context_bar('showpullrequest @@
         <div class="form-group">
           <label>${_('Reviewer voting result')}:</label>
           <div>
-            <div class="changeset-status-container" style="float:none;clear:both">
             <div class="changeset-status-container">
             %if c.current_voting_result:
               <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>
@@ @@ -175,7 +175,7 @@ ${self.repo_context_bar('showpullrequest @@
                         <td style="width: 120px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
                         <td>
-                          <div style="float: right; margin-top: -4px;">
+                          <div class="pull-right" style="margin-top: -4px;">
                             %for tag in cs.tags:
                               <span class="tagtag" title="${_('Tag %s') % tag}">
                                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
@@ @@ -206,7 +206,7 @@ ${self.repo_context_bar('showpullrequest @@
       </div>
     </div>
     ## REVIEWERS
-    <div style="float:left">
+    <div class="pull-left">
         <h4 class="pr-details-title">${_('Pull Request Reviewers')}</h4>
         <div id="reviewers" style="padding:0px 0px 5px 10px">
           ## members goes here !

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -129,26 +129,26 @@ summary = lambda n:{False:'summary-short @@
             <li class="list-group-item">
                <a title="${_('Owner')} ${c.db_repo.owner.email}">
                 <i class="icon-user"></i> ${c.db_repo.owner.username}
-                ${h.gravatar_div(c.db_repo.owner.email, size=18, div_style="float: right; margin: 0px 0px 0px 0px", div_title=c.db_repo.owner.full_name)}
+                ${h.gravatar_div(c.db_repo.owner.email, size=18, div_class="pull-right", div_style="margin: 0", div_title=c.db_repo.owner.full_name)}
               </a>
             </li>
             <li class="list-group-item">
                <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                 <i class="icon-heart"></i> ${_('Followers')}
                 <span class="badge" id="current_followers_count">${c.repository_followers}</span>
+                <span class="badge pull-right" id="current_followers_count">${c.repository_followers}</span>
               </a>
             </li>
             <li class="list-group-item">
               <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
                 <i class="icon-fork"></i> ${_('Forks')}
                 <span class="badge">${c.repository_forks}</span>
+                <span class="badge pull-right">${c.repository_forks}</span>
               </a>
             </li>
             %if request.authuser.username != 'default':
             <li class="list-group-item clearfix">
               <a href="#" onclick="javascript:showRepoSize('repo_size_2','${c.db_repo.repo_name}')"><i class="icon-ruler"></i> ${_('Repository Size')}</a>
-              <span  class="stats-bullet" id="repo_size_2"></span>
+              <span  class="badge pull-right" id="repo_size_2"></span>
             </li>
             %endif

0 comments (0 inline, 0 general)