Mercurial > kallithea

changeset 6720:9846e4d1f9cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style: drop some redundant and empty divs
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 25 Jun 2017 18:27:28 +0200
parents 365708e66383
children f17431fde3c7
files kallithea/templates/admin/repos/repo_creating.html kallithea/templates/admin/user_groups/user_group_edit_settings.html kallithea/templates/base/root.html kallithea/templates/files/diff_2way.html kallithea/templates/followers/followers_data.html kallithea/templates/forks/forks_data.html
diffstat 6 files changed, 13 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/admin/repos/repo_creating.html	Sun Jun 25 18:26:49 2017 +0200
+++ b/kallithea/templates/admin/repos/repo_creating.html	Sun Jun 25 18:27:28 2017 +0200
@@ -29,7 +29,7 @@
 
         <div id="progress">
             <div class="progress progress-striped active">
-                <div class="progress-bar progress-bar" role="progressbar"
+                <div class="progress-bar" role="progressbar"
                     aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">
                 </div>
             </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html	Sun Jun 25 18:26:49 2017 +0200
+++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html	Sun Jun 25 18:27:28 2017 +0200
@@ -23,18 +23,22 @@
                 <div class="form-group">
                     <label class="control-label">${_('Members')}:</label>
                     <div>
-                        <div>
+                        <div class="pull-left">
                             <div class="text">${_('Chosen group members')}</div>
-                            ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
+                            ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="width:210px",class_='form-control')}
                         </div>
-                        <div>
+                        <div class="pull-left">
+                          <div class="text">&nbsp;</div>
+			  <div>
                             <i id="add_element" class="icon-left-open" title="Choose selected available"></i>
-                            <div></div>
+                          </div>
+                          <div>
                             <i id="remove_element" class="icon-right-open" title="Remove selected chosen"></i>
+                          </div>
                         </div>
-                        <div>
+                        <div class="pull-left">
                             <div class="text">${_('Available members')}</div>
-                            ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
+                            ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="width:210px",class_='form-control')}
                         </div>
                     </div>
                 </div>
--- a/kallithea/templates/base/root.html	Sun Jun 25 18:26:49 2017 +0200
+++ b/kallithea/templates/base/root.html	Sun Jun 25 18:27:28 2017 +0200
@@ -107,7 +107,6 @@
     </head>
     <body>
       <nav class="navbar navbar-inverse">
-        <div>
           <div class="navbar-header" id="logo">
             <a class="navbar-brand" href="${h.url('home')}">
                 <img class="pull-left" src="${h.url('/images/kallithea-logo.svg')}" alt="Kallithea"/>
@@ -125,7 +124,6 @@
           <div id="navbar" class="navbar-collapse collapse">
             <%block name="header_menu"/>
           </div>
-        </div>
       </nav>
 
       ${next.body()}
--- a/kallithea/templates/files/diff_2way.html	Sun Jun 25 18:26:49 2017 +0200
+++ b/kallithea/templates/files/diff_2way.html	Sun Jun 25 18:27:28 2017 +0200
@@ -33,7 +33,6 @@
     <div class="no-padding panel-body">
         <div class="panel panel-default">
             <div class="panel-heading clearfix">
-                <div class="changeset_header">
                     <div class="pull-left">
                         ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,
                         revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
@@ -54,7 +53,6 @@
                       ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
                       ${h.checkbox('edit_mode', label=_('Edit'))}
                     </div>
-                </div>
             </div>
             <div id="compare"></div>
         </div>
--- a/kallithea/templates/followers/followers_data.html	Sun Jun 25 18:26:49 2017 +0200
+++ b/kallithea/templates/followers/followers_data.html	Sun Jun 25 18:27:28 2017 +0200
@@ -6,10 +6,9 @@
             ${h.gravatar_div(f.user.email, size=24)}
             <span> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
-        <div></div>
         <div class="follower_date">${_('Started following -')}
-        <span data-toggle="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div>
-        <div></div>
+          <span data-toggle="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span>
+        </div>
     </div>
 % endfor
 
--- a/kallithea/templates/forks/forks_data.html	Sun Jun 25 18:26:49 2017 +0200
+++ b/kallithea/templates/forks/forks_data.html	Sun Jun 25 18:27:28 2017 +0200
@@ -11,7 +11,6 @@
                 </span>
                 <div>${f.description}</div>
             </div>
-            <div></div>
             <div class="follower_date">${_('Forked')} -
                 <span data-toggle="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span>
                 <a title="${_('Compare fork with %s') % c.repo_name}"