aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <a3li@gentoo.org>2011-10-22 17:21:40 +0200
committerAlex Legler <a3li@gentoo.org>2011-10-22 17:21:40 +0200
commita8b881b361b7255d2c5c41ce5db57d9a71275961 (patch)
tree5e172a942a680d4955931bd28d20f8cc772d4ac9
parentHandle nil values as input to the Kramdown converter (diff)
parentFix comment box overlap hopefully for good (diff)
downloadglsamaker-a8b881b361b7255d2c5c41ce5db57d9a71275961.tar.gz
glsamaker-a8b881b361b7255d2c5c41ce5db57d9a71275961.tar.bz2
glsamaker-a8b881b361b7255d2c5c41ce5db57d9a71275961.zip
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/glsamaker
-rw-r--r--app/views/glsa/_comments.html.erb4
-rw-r--r--app/views/glsa/show.html.erb1
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/glsa/_comments.html.erb b/app/views/glsa/_comments.html.erb
index 28f757f..5a58af9 100644
--- a/app/views/glsa/_comments.html.erb
+++ b/app/views/glsa/_comments.html.erb
@@ -1,4 +1,4 @@
- <div class="box" id="comments">
+ <div class="box" id="comments" style="margin-bottom: 4em;">
<%= box_title('Comments', :icon => 'icons/comment.png',
:toolbar => [
{:title => 'Add comment', :uri => "javascript:addCommentDialog(#{@glsa.id})", :icon => 'icons/plus.png'},
@@ -8,4 +8,4 @@
<ul id="commentslist">
<%= render :partial => "comment", :collection => @glsa.comments %>
</ul>
- </div> \ No newline at end of file
+ </div>
diff --git a/app/views/glsa/show.html.erb b/app/views/glsa/show.html.erb
index 20e8e49..fad6118 100644
--- a/app/views/glsa/show.html.erb
+++ b/app/views/glsa/show.html.erb
@@ -148,4 +148,3 @@
</table>
<br style="break: both;" />
-<br style="break: both;" /> \ No newline at end of file