allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject [1/3] allura git commit: Make merge instructions textarea height/width controllable by theme CSS
Date Tue, 09 Jan 2018 13:55:04 GMT
Repository: allura
Updated Branches:
  refs/heads/master cfa73f775 -> 371b9c3ca


Make merge instructions textarea height/width controllable by theme CSS


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/26114413
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/26114413
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/26114413

Branch: refs/heads/master
Commit: 26114413dba3f9656641542dc0655a536ad4efbf
Parents: cfa73f7
Author: Dave Brondsema <dave@brondsema.net>
Authored: Mon Jan 8 14:38:25 2018 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Mon Jan 8 14:38:25 2018 -0500

----------------------------------------------------------------------
 Allura/allura/templates/repo/merge_request.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/26114413/Allura/allura/templates/repo/merge_request.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_request.html b/Allura/allura/templates/repo/merge_request.html
index 7d861e9..c408ba4 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -128,7 +128,7 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
         To merge the commits, please execute the following commands in your working copy:
       </div>
       <div class="grid-19">
-        <textarea style="width:80%; height:60px;" readonly>{{ c.app.repo.merge_command(req)
| safe }}</textarea>
+        <textarea class="merge-instructions" readonly>{{ c.app.repo.merge_command(req)
| safe }}</textarea>
       </div>
       {% if merge_status not in ('ready', 'busy') %}
         {{ c.mr_dispose_form.display(action="save", value=dict(status=req.status)) }}
@@ -170,6 +170,7 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
   .merge-ok { color: green; }
   .merge-conflicts { color: red; }
   .can-merge-in-progress { color: grey; }
+  .merge-instructions { width:80%; height:60px; }
 
   #merge_task_status .{{ merge_status }} { display: inline-block; }
   #can_merge_task_status .{{ can_merge_status }} { display: inline-block; }


Mime
View raw message