kallithea Changeset - 4749158e7d1c

Changeset - 4749158e7d1c

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 8 years ago 2017-10-29 23:22:18
dominikruf@gmail.com

Grafted from: b7bbe244da60

less: bootstrap grid system for settings like pages

2 files changed with 73 insertions and 29 deletions:

kallithea/public/less/style.less

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/less/style.less

➞

Show inline comments

@@ @@ -174,51 +174,48 @@ table.dataTable { @@
+}
 /* don't break author, date and comment cells into multiple lines in changeset table */
 table.changesets {
   .author,
   .date,
   .comments {
     white-space: nowrap;
+  }
+}
 /* textareas should be at least 100px high and 400px wide */
 textarea.form-control {
   min-height: 100px;
   min-width: 400px;
+}
 /* add some space between the code-browser icons and the file names */
 .browser-dir > i[class^='icon-'],
 .submodule-dir > i[class^='icon-'],
 .browser-file > i[class^='icon-'] {
   padding-right: 0.3em;
+}
 .form-group > label {
   float: left;
+}
 .dt_repo_pending {
   opacity: 0.5;
+}
 div.panel-primary {
   border: none;
+}
 /* no extra vertical margin */
 #content div.panel ul.pagination {
   margin: 0;
+}
 /* remove margin below footer */
 .navbar.footer {
   margin-bottom: 0;
+}
 .user-menu {
   padding: 0 !important;
+}
 #quick_login {
   width: 360px;
   margin-top: 15px;
@@ @@ -394,64 +391,51 @@ table#changesets tr.out-of-range { @@
   font-weight: 700;
   font-size: 14px;
+}
 table#permissions_manage span.private_repo_msg {
   font-size: 0.8em;
   opacity: 0.6;
+}
 table#permissions_manage td.private_repo_msg {
   font-size: 0.8em;
+}
 table#permissions_manage tr#add_perm_input td {
   vertical-align: middle;
+}
 div.gravatar {
   float: left;
   background-color: #FFF;
   margin-right: 0.7em;
   padding: 1px 1px 1px 1px;
   line-height: 0;
   border-radius: 3px;
+}
 div.gravatar img {
   border-radius: 2px;
+}
 .panel-body.settings > ul.nav-stacked {
   float: left;
   width: 150px;
   padding-right: 35px;
   color: #393939;
   font-weight: 700;
+}
 .panel-body.settings .nav-pills > :not(.active) > a {
   color: inherit;
+}
 .panel-body.settings > div,
 .panel-body.settings > form {
   float: left;
   width: 750px;
   margin: 0;
+}
 .panel-body.no-padding {
   padding: 0;
+}
 .panel-body ~ .panel-body {
   padding-top: 0;
+}
 .panel-body.no-padding ~ .panel-body {
   padding-top: 15px;
+}
 .panel-body > :last-child {
   margin-bottom: 0;
+}
 .panel-body.settings .text-muted {
   margin: 5px 0;
+}
 ins,
 div.options a:hover {
   text-decoration: none;
+}
 img,
 nav.navbar #quick li a:hover span.normal,
 #clone_url,
 #clone_url_id {
   border: none;
@@ @@ -483,68 +467,61 @@ div#legend_choices { @@
+}
 #overview {
   clear: both;
   width: 450px;
   height: 100px;
+}
 #content #left #menu ul.closed,
 #content #left #menu li ul.collapsed,
 .yui-tt-shadow {
   display: none;
+}
 #content #left #menu ul.opened,
 #content #left #menu li ul.expanded {
   display: block !important;
+}
 #content div.panel ol.lower-roman,
 #content div.panel ol.upper-roman,
 #content div.panel ol.lower-alpha,
 #content div.panel ol.upper-alpha,
 #content div.panel ol.decimal {
   margin: 10px 24px 10px 44px;
+}
 #content div.panel div.form div.form-group > div {
   margin: 0 0 10px 200px;
+}
 div.form div.form-group div.button input,
 #content div.panel div.form div.buttons input,
 div.form div.buttons input,
 #content div.panel div.action div.button input {
   font-size: 11px;
   font-weight: 700;
   margin: 0;
+}
 div.form div.form-group div.highlight,
 #content div.panel div.form div.buttons div.highlight {
   display: inline;
+}
 #content div.panel div.form div.buttons,
 div.form div.buttons {
   margin: 10px 10px 0 200px;
   padding: 0;
+}
 #content div.panel table td.user,
 #content div.panel table td.address {
   width: 10%;
   text-align: center;
+}
 #content div.panel div.action div.button {
   text-align: right;
   margin: 6px 0 0;
   padding: 0;
+}
 #login,
 #register {
   width: 520px;
   margin: 10% auto 0;
   padding: 0;
+}
 .ac .match {
   font-weight: 700;
   padding-top: 5px;
   padding-bottom: 5px;
+}
 .q_filter_box {
   border-radius: 4px;
   border: 0 none;
@@ @@ -626,52 +603,48 @@ PULL REQUESTS @@
 *****/
 div.pr-details-title.closed {
   color: #555;
   background: #eee;
+}
 div.pr {
   margin: 0px 15px;
   padding: 4px 4px;
+}
 tr.pr-closed td {
   background-color: #eee !important;
   color: #555 !important;
+}
 span.pr-closed-tag {
   margin-bottom: 1px;
   margin-right: 1px;
   padding: 1px 3px;
   font-size: 10px;
   color: @kallithea-theme-main-color;
   white-space: nowrap;
   border-radius: 4px;
   border: 1px solid #d9e8f8;
   line-height: 1.5em;
+}
 .panel-body .pr-box {
   max-width: 978px;
   margin-right: 15px;
+}
 #s2id_org_ref,
 #s2id_other_ref,
 #s2id_org_repo,
 #s2id_other_repo {
   min-width: 150px;
   margin: 5px;
+}
 #pr-summary > .pr-not-edit {
   min-height: 50px !important;
+}
 /* make 'next iteration' changeset table smaller and scrollable */
 #pr-summary #updaterevs {
   max-height: 200px;
   overflow-y: auto;
   overflow-x: hidden;
+}
 /****
   PERMS
 *****/
 .perm-gravatar-ac {
   vertical-align: middle;
   padding: 2px;
   width: 14px;
@@ @@ -722,48 +695,119 @@ div.comment:target > .panel { @@
   margin: 5px;
+}
 div.comment-prev-next-links div.prev-comment,
 div.comment-prev-next-links div.next-comment {
   display: inline-block;
   min-width: 150px;
   margin: 3px 6px;
+}
 #comments-general-comments div.comment-prev-next-links div.prev-comment,
 #comments-general-comments div.comment-prev-next-links div.next-comment {
   margin-left: 0;
+}
 /* changelog graph */
 #graph_nodes,
 #updaterevs-graph {
   .make-xs-column(1);
+}
 #graph_content,
 #graph_content_pr,
 #updaterevs-table {
   .make-xs-column(11);
+}
 /* use columns and form-horizontal for settings pages ... on wide screens */
 @media (min-width: @screen-sm-min) {
   .settings {
     max-width: @container-md;
     > ul.nav-stacked {
       .make-sm-column(2);
       max-width: (@container-md/12)*2;
+    }
     > div {
       .make-sm-column(10);
       max-width: (@container-md/12)*10;
+    }
     .form {
       .form-horizontal;
+    }
     .form-group {
       .clearfix;
       > label {
         .make-xs-column(3);
         input {
           width: 100%;
+        }
+      }
       > div {
         .make-xs-column(9);
+      }
       .buttons {
         .make-xs-column-offset(3);
+      }
+    }
+  }
+}
 /* use columns and form-horizontal for summary page */
 #summary {
   max-width: @container-md;
   .form-horizontal;
   .make-sm-column(10);
   .form-group > label {
     .make-sm-column(2);
+  }
   .form-group > div {
     .make-sm-column(10);
+  }
+}
 #summary-menu-stats {
   .make-sm-column(2);
+}
 /* use columns and form-horizontal for pull request page */
 .pr-box {
   .make-sm-column(9);
   #pr-summary {
     max-width: @container-md;
     .form-horizontal;
     .form-group > label {
       .make-sm-column(3);
+    }
     .form-group > div {
       .make-sm-column(9);
+    }
     .form-group > .buttons {
       .make-sm-column-offset(3);
       .make-sm-column(9);
+    }
+  }
+}
 .pr-reviewers-box {
   .make-sm-column(3);
+}
 /* repo table icons */
 #repos_list_wrap_wrapper {
   /* make icon-folder and repotag the same width */
   .icon-folder:before {
     margin: 0; // default margin would otherwise add to the total width
     width: 24px;
     text-align: left;
+  }
   .label-repo {
     display: inline-block;
     width: 24px;
+  }
+}
 /* changelog table columns */
 .table#changesets {
   table-layout: fixed;
   td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     vertical-align: baseline;
+  }
   .checkbox-column {

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -172,49 +172,49 @@ ${self.repo_context_bar('showpullrequest @@
                       %endif
                     </tr>
                   %endfor
                 </table>
               </div>
               <div class="alert alert-info">${_("Pull request iterations do not change content once created. Select a revision to create a new iteration.")}</div>
               %endif
               %if c.update_msg_other:
                 <div class="alert alert-info">${c.update_msg_other}</div>
               %endif
             </div>
         </div>
         %if editable:
         <div class="form-group">
           <div class="buttons">
             ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-default btn-sm")}
             ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-default btn-sm",disabled='disabled')}
             ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-default btn-sm")}
           </div>
         </div>
         %endif
       </div>
     </div>
     ## REVIEWERS
     <div class="pull-left">
+    <div class="pr-reviewers-box pull-left">
         <h4 class="pr-details-title">${_('Reviewers')}</h4>
         <div id="reviewers">
           ## members goes here !
           <div>
             %for member,status in c.pull_request_reviewers:
               <input type="hidden" value="${member.user_id}" name="org_review_members" />
             %endfor
             <ul id="review_members" class="list-unstyled">
             %for member,status in c.pull_request_reviewers:
               ## WARNING: the HTML below is duplicate with
               ## kallithea/public/js/base.js
               ## If you change something here it should be reflected in the template too.
               <li id="reviewer_${member.user_id}">
                 <span class="reviewers_member">
                   <input type="hidden" value="${member.user_id}" name="review_members" />
                   <span class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">
                       <i class="icon-circle changeset-status-${status}"></i>
                   </span>
                   ${h.gravatar(member.email, size=14)}
                   <span>
                     ${member.full_name_and_username}
                     %if c.pull_request.owner_id == member.user_id:
                       (${_('Owner')})
                     %endif

0 comments (0 inline, 0 general)