kallithea Changeset - f460139aa6d6

Changeset - f460139aa6d6

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 8 years ago 2018-03-11 12:20:29
dominikruf@gmail.com

Grafted from: 5b98427cfd66

pullrequests: fix position of edit button

The edit button belongs to the label, so lets put it there.
We then do't need the #pr-edit-btn style any more.

2 files changed with 2 insertions and 5 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

@@ @@ -652,28 +652,24 @@ span.pr-closed-tag { @@
   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;
+}
 #pr-edit-btn {
   margin: 20px 0 0 !important;
   position: absolute;
+}
 /* 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;

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -26,30 +26,31 @@ ${self.repo_context_bar('showpullrequest @@
     <div class="form pr-box pull-left">
       <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">
         <h3>
           ${_('Title')}: ${c.pull_request.title}
           %if c.pull_request.is_closed():
               (${_('Closed')})
           %endif
         </h3>
       </div>
       <div id="pr-summary">
         <div class="pr-not-edit form-group">
-            <label>${_('Description')}:</label>
             <label>${_('Description')}:
             %if editable:
             <div id="pr-edit-btn">
               <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
             </label>
             <div>
               <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
             </div>
         </div>
         %if editable:
         <div class="pr-do-edit form-group" style="display:none">
               <label for="pullrequest_title">${_('Title')}:</label>
               <div>
                   ${h.text('pullrequest_title',class_='form-control',value=c.pull_request.title,placeholder=_('Summarize the changes'))}
               </div>
         </div>

0 comments (0 inline, 0 general)