changeset 7206:f460139aa6d6

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.
author domruf <dominikruf@gmail.com>
date Sun, 11 Mar 2018 12:20:29 +0100
parents 8290f9652cb4
children 4749158e7d1c
files kallithea/public/less/style.less kallithea/templates/pullrequests/pullrequest_show.html
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/less/style.less	Sun Mar 11 10:23:33 2018 +0100
+++ b/kallithea/public/less/style.less	Sun Mar 11 12:20:29 2018 +0100
@@ -661,10 +661,6 @@
 #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;
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Sun Mar 11 10:23:33 2018 +0100
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Sun Mar 11 12:20:29 2018 +0100
@@ -35,12 +35,13 @@
       <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>