kallithea Changeset - 42f3115cc2ac

Changeset - 42f3115cc2ac

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Thomas De Schampheleire - 11 years ago 2015-03-03 21:37:44
thomas.de.schampheleire@gmail.com

style: add class 'normal-indent' instead of repeated explicit margins

Add a new CSS class for the standard indentation inside the main box,
instead of repeating 'style="..."' statements on the relevant elements.

Ideally, this class should not exist as the necessary padding would be added
to the main box itself, but reworking this is a bigger exercise (to be done
later).

3 files changed with 6 insertions and 2 deletions:

kallithea/public/css/style.css

kallithea/templates/pullrequests/pullrequest_show_all.html

kallithea/templates/pullrequests/pullrequest_show_my.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -949,24 +949,28 @@ tbody .yui-dt-editable { cursor: pointer @@
 #content div.box div.h1,
 #content div.box div.h2,
 #content div.box div.h3,
 #content div.box div.h4,
 #content div.box div.h5,
 #content div.box div.h6 {
     clear: both;
     overflow: hidden;
     margin: 8px 20px 3px;
     padding-bottom: 2px;
+}
 #content div.box div.normal-indent {
     margin: 0 20px 10px 20px;
+}
 #content div.box p {
     color: #5f5f5f;
     font-size: 12px;
     line-height: 150%;
     margin: 0 24px 10px;
     padding: 0;
+}
 #content div.box blockquote {
     border-left: 4px solid #DDD;
     color: #5f5f5f;
     font-size: 11px;

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -32,25 +32,25 @@ ${self.repo_context_bar('showpullrequest @@
              %endif
               <span>
                 %if c.from_:
                     <a class="btn btn-small" 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-small" 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>
-    <div style="margin: 0 20px 10px 20px">
+    <div class="normal-indent">
         <div>
         %if c.closed:
             ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))}
         %else:
             ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))}
         %endif
         </div>
     </div>
     <%include file='pullrequest_data.html'/>
 </div>

kallithea/templates/pullrequests/pullrequest_show_my.html

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ @@
 <%block name="header_menu">
     ${self.menu('my_pullrequests')}
 </%block>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
-    <div style="margin: 0 20px">
+    <div class="normal-indent">
         <div>
         %if c.closed:
             ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('my_pullrequests'))}
         %else:
             ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('my_pullrequests',closed=1))}
         %endif
         </div>
     </div>
     <div id="pullrequests_container" class="table">
         <%include file='pullrequest_show_my_data.html'/>
     </div>

0 comments (0 inline, 0 general)