kallithea Changeset - 508a49a1a02f

Changeset - 508a49a1a02f

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Thomas De Schampheleire - 11 years ago 2015-02-21 22:45:22
thomas.de_schampheleire@alcatel-lucent.com

pullrequest overview: sanitize display style

Remove the unnecessarily large font size on the pullrequest overview to line
up with the styling of 'my pullrequests'.

Additionally, add some whitespace between the 'show closed PRs' link and the
actual list.

3 files changed with 2 insertions and 5 deletions:

kallithea/public/css/style.css

kallithea/templates/pullrequests/pullrequest_data.html

kallithea/templates/pullrequests/pullrequest_show_all.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4609,51 +4609,48 @@ form.comment-inline-form { @@
     padding: 5px 0px 5px 38px;
+}
 .notification-body {
     clear: both;
     margin: 34px 2px 2px 8px
+}
 /****
 PULL REQUESTS
 *****/
 .pullrequests_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
     font-weight: bold;
+}
 div.pr-details-title.closed,
 #pullrequests_container li.closed div div
+ {
     color: #555;
     background: #eee;
+}
 div.pr-title {
     font-size: 1.6em;
+}
 div.pr-details-title {
     font-size: 1.6em;
     padding: 5px 0px 5px 10px;
+}
 div.pr {
     margin: 0px 20px;
     padding: 4px 4px;
+}
 div.pr-desc {
     margin: 0px 20px;
+}
 div.pr-closed {
     background-color: #eee;
+}
 span.pr-closed-tag {
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #577632;

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % for pr in c.pullrequests_pager:
   <div class="pr ${'pr-closed' if pr.is_closed() else ''}">
-    <div class="pr-title">
     <div>
     %if pr.last_review_status:
       <i class="icon-circle changeset-status-${pr.last_review_status}" title="${_("Someone voted: %s") % pr.last_review_status}"></i>
     %else:
       <i class="icon-circle changeset-status-not_reviewed" title="${_("Nobody voted")}"></i>
     %endif
       <a href="${pr.url()}">
       ${pr.title or _("(no title)")}
        %if pr.is_closed():
          <span class="pr-closed-tag">${_('Closed')}</span>
        %endif
       </a>
             ${_('opened on %s from') % (h.fmt_date(pr.created_on))}
             <% org_ref_name=pr.org_ref.rsplit(':', 2)[-2] %>
             <a href="${h.url('summary_home', repo_name=pr.org_repo.repo_name, anchor=org_ref_name)}">
               ${pr.org_repo.repo_name}#${org_ref_name}
             </a>
     </div>
   </div>
 % endfor
 <div class="notification-paginator">
   <div class="pagination-wh pagination-left">
   ${c.pullrequests_pager.pager('$link_previous ~2~ $link_next', **request.GET.mixed())}

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -20,38 +20,38 @@ @@
 ${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">
+    <div style="margin: 0 20px 10px 20px">
         <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>

0 comments (0 inline, 0 general)