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

@@ @@ -769,384 +769,388 @@ tbody .yui-dt-editable { cursor: pointer @@
 .yui-skin-sam tr.yui-dt-odd td.yui-dt-desc { background-color: #dbeaff }
 .yui-skin-sam .yui-dt-list tr.yui-dt-even { background-color: #FFF }
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd { background-color: #FFF }
 .yui-skin-sam .yui-dt-list tr.yui-dt-even td.yui-dt-asc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-even td.yui-dt-desc { background-color: #edf5ff }
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd td.yui-dt-asc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd td.yui-dt-desc { background-color: #edf5ff }
 .yui-skin-sam th.yui-dt-highlighted,
 .yui-skin-sam th.yui-dt-highlighted a { background-color: #b2d2ff }
 .yui-skin-sam tr.yui-dt-highlighted,
 .yui-skin-sam tr.yui-dt-highlighted td.yui-dt-asc,
 .yui-skin-sam tr.yui-dt-highlighted td.yui-dt-desc,
 .yui-skin-sam tr.yui-dt-even td.yui-dt-highlighted,
 .yui-skin-sam tr.yui-dt-odd td.yui-dt-highlighted {
     cursor: pointer;
     background-color: #b2d2ff;
+}
 .yui-skin-sam .yui-dt-list th.yui-dt-highlighted,
 .yui-skin-sam .yui-dt-list th.yui-dt-highlighted a { background-color: #b2d2ff }
 .yui-skin-sam .yui-dt-list tr.yui-dt-highlighted,
 .yui-skin-sam .yui-dt-list tr.yui-dt-highlighted td.yui-dt-asc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-highlighted td.yui-dt-desc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-even td.yui-dt-highlighted,
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd td.yui-dt-highlighted {
     cursor: pointer;
     background-color: #b2d2ff;
+}
 .yui-skin-sam th.yui-dt-selected,
 .yui-skin-sam th.yui-dt-selected a { background-color: #446cd7 }
 .yui-skin-sam tr.yui-dt-selected td,
 .yui-skin-sam tr.yui-dt-selected td.yui-dt-asc,
 .yui-skin-sam tr.yui-dt-selected td.yui-dt-desc {
     background-color: #426fd9;
     color: #FFF;
+}
 .yui-skin-sam tr.yui-dt-even td.yui-dt-selected,
 .yui-skin-sam tr.yui-dt-odd td.yui-dt-selected {
     background-color: #446cd7;
     color: #FFF;
+}
 .yui-skin-sam .yui-dt-list th.yui-dt-selected,
 .yui-skin-sam .yui-dt-list th.yui-dt-selected a { background-color: #446cd7 }
 .yui-skin-sam .yui-dt-list tr.yui-dt-selected td,
 .yui-skin-sam .yui-dt-list tr.yui-dt-selected td.yui-dt-asc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-selected td.yui-dt-desc {
     background-color: #426fd9;
     color: #FFF;
+}
 .yui-skin-sam .yui-dt-list tr.yui-dt-even td.yui-dt-selected,
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd td.yui-dt-selected {
     background-color: #446cd7;
     color: #FFF;
+}
 .yui-skin-sam .yui-dt-paginator {
     display: block;
     margin: 6px 0;
     white-space: nowrap;
+}
 .yui-skin-sam .yui-dt-paginator .yui-dt-first,
 .yui-skin-sam .yui-dt-paginator .yui-dt-last,
 .yui-skin-sam .yui-dt-paginator .yui-dt-selected { padding: 2px 6px }
 .yui-skin-sam .yui-dt-paginator a.yui-dt-first,
 .yui-skin-sam .yui-dt-paginator a.yui-dt-last { text-decoration: none }
 .yui-skin-sam .yui-dt-paginator .yui-dt-previous,
 .yui-skin-sam .yui-dt-paginator .yui-dt-next { display: none }
 .yui-skin-sam a.yui-dt-page {
     border: 1px solid #cbcbcb;
     padding: 2px 6px;
     text-decoration: none;
     background-color: #fff;
+}
 .yui-skin-sam .yui-dt-selected {
     border: 1px solid #fff;
     background-color: #fff;
+}
 #content #left {
     left: 0;
     width: 280px;
     position: absolute;
+}
 #content #right {
     margin: 0 60px 10px 290px;
+}
 #content div.box {
     clear: both;
     background: #fff;
     margin: 0 0 10px;
     padding: 0 0 10px;
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #content div.box-left {
     width: 49%;
     clear: none;
     float: left;
     margin: 0 0 10px;
+}
 #content div.box-right {
     width: 49%;
     clear: none;
     float: right;
     margin: 0 0 10px;
+}
 #content div.box div.title {
     clear: both;
     overflow: hidden;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#577632), to(#577632) );
     background-image: -moz-linear-gradient(top, #577632, #577632);
     background-image: -ms-linear-gradient(top, #577632, #577632);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #577632), color-stop(100%, #577632) );
     background-image: -webkit-linear-gradient(top, #577632, #577632);
     background-image: -o-linear-gradient(top, #577632, #577632);
     background-image: linear-gradient(to bottom, #577632, #577632);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#577632', endColorstr='#577632', GradientType=0 );
     margin: 0 0 20px;
     padding: 0;
     border-radius: 4px 4px 0 0;
+}
 #content div.box div.title h5 {
     float: left;
     border: none;
     color: #fff;
     margin: 0;
     padding: 11px 0 11px 10px;
+}
 #content div.box div.title .link-white {
     color: #FFFFFF;
+}
 #content div.box div.title .link-white.current {
     color: #BFE3FF;
+}
 #content div.box div.title ul.links li {
     list-style: none;
     float: left;
     margin: 0;
     padding: 0;
+}
 #content div.box div.title ul.links li a {
     font-size: 13px;
     font-weight: 700;
     height: 1%;
     margin: 4px;
     text-decoration: none;
+}
 #content div.box div.title ul.links.nav-tabs li a {
     float: left;
     color: #fff;
     margin: 0;
     padding: 11px 10px 11px 10px;
+}
 #content div.box div.title ul.links.icon-only-links li a {
     float: left;
     color: #fff;
     margin: 0;
     padding: 11px 10px 11px 10px;
+}
 #content div.box h1,
 #content div.box h2,
 #content div.box h3,
 #content div.box h4,
 #content div.box h5,
 #content div.box h6,
 #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;
     line-height: 150%;
     margin: 0 34px;
     padding: 0 0 0 14px;
+}
 #content div.box blockquote p {
     margin: 10px 0;
     padding: 0;
+}
 #content div.box dl {
     margin: 10px 0px;
+}
 #content div.box dt {
     font-size: 12px;
     margin: 0;
+}
 #content div.box dd {
     font-size: 12px;
     margin: 0;
     padding: 8px 0 8px 15px;
+}
 #content div.box li {
     font-size: 12px;
     padding: 4px 0;
+}
 #content div.box ul.disc,
 #content div.box ul.circle {
     margin: 10px 24px 10px 38px;
+}
 #content div.box ul.square {
     margin: 10px 24px 10px 40px;
+}
 #content div.box img.left {
     border: none;
     float: left;
     margin: 10px 10px 10px 0;
+}
 #content div.box img.right {
     border: none;
     float: right;
     margin: 10px 0 10px 10px;
+}
 #content div.box div.messages {
     clear: both;
     overflow: hidden;
     margin: 0 20px;
     padding: 0;
+}
 #content div.box div.message {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 5px 0;
     white-space: pre-wrap;
+}
 #content div.box div.expand {
     width: 110%;
     height: 14px;
     font-size: 10px;
     text-align: center;
     cursor: pointer;
     color: #666;
     background: -webkit-gradient(linear,0% 50%,100% 50%,color-stop(0%,rgba(255,255,255,0)),color-stop(100%,rgba(64,96,128,0.1)));
     background: -webkit-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: -moz-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: -o-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: -ms-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(64,96,128,0.1));
     display: none;
     overflow: hidden;
+}
 #content div.box div.expand .expandtext {
     background-color: #ffffff;
     padding: 2px;
     border-radius: 2px;
+}
 #content div.box div.message a {
     font-weight: 400 !important;
+}
 #content div.box div.message div.image {
     float: left;
     margin: 9px 0 0 5px;
     padding: 6px;
+}
 #content div.box div.message div.image img {
     vertical-align: middle;
     margin: 0;
+}
 #content div.box div.message div.text {
     float: left;
     margin: 0;
     padding: 9px 6px;
+}
 #content div.box div.message div.text h1,
 #content div.box div.message div.text h2,
 #content div.box div.message div.text h3,
 #content div.box div.message div.text h4,
 #content div.box div.message div.text h5,
 #content div.box div.message div.text h6 {
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.box div.message div.text span {
     height: 1%;
     display: block;
     margin: 0;
     padding: 5px 0 0;
+}
 #content div.box div.message-error {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #FBE3E4;
     border: 1px solid #FBC2C4;
     color: #860006;
+}
 #content div.box div.message-error h6 {
     color: #860006;
+}
 #content div.box div.message-warning {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #FFF6BF;
     border: 1px solid #FFD324;
     color: #5f5200;
+}
 #content div.box div.message-warning h6 {
     color: #5f5200;
+}
 #content div.box div.message-notice {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #8FBDE0;
     border: 1px solid #6BACDE;
     color: #003863;
+}
 #content div.box div.message-notice h6 {
     color: #003863;
+}
 #content div.box div.message-success {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #E6EFC2;
     border: 1px solid #C6D880;
     color: #4e6100;
+}
 #content div.box div.message-success h6 {
     color: #4e6100;
+}

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('%s Pull Requests') % c.repo_name}
 </%block>
 <%def name="breadcrumbs_links()">
 %if c.from_:
     ${_("Pull Requests from %s'") % c.repo_name}
 %else:
     ${_("Pull Requests to '%s'") % c.repo_name}
 %endif
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
              %if c.authuser.username != 'default':
               <span>
                   <a id="open_new_pr" class="btn btn-small btn-success" 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-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>
 </%def>

kallithea/templates/pullrequests/pullrequest_show_my.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('My Pull Requests')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('My Pull Requests')}
 </%def>
 <%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>
 </div>
 </%def>

0 comments (0 inline, 0 general)