--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -25,20 +25,20 @@
<div>{{g.markdown.convert(req.description)}}</div>
{{ c.log_widget.display(value=req.commits) }}
- <div><a href="#discussion_holder">Discuss</a></div>
+ <div class="grid-19"><a href="#discussion_holder">Discuss</a></div>
{% if h.has_artifact_access('write')() %}
<p>To merge the commits, please execute the following commands in your working
copy: </p>
- <textarea
+ <div class="grid-19"><textarea
style="width:80%"
readonly
- >{{ c.app.repo.merge_command(req) | safe }}</textarea>
+ >{{ c.app.repo.merge_command(req) | safe }}</textarea></div>
{{ c.mr_dispose_form.display(action="save", value=dict(status=req.status)) }}
<br style="clear:both">
{% endif %}
- <div class="title-pane">
+ <div class="title-pane grid-19">
<h2 class="title">Commits</h2>
<div class="content">
{{ c.log_widget.display(value=req.commits) }}