summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-12-19 20:19:48 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-12-19 20:19:48 +0000
commit49bdf62243dccb6398bdac78b0eff9f1138b28fa (patch)
treebe6b0179e102f221b0777bc15c9601354ed4bd74
parente219af1fbd96a069b46443202fef9fab1a51bd38 (diff)
downloadredmine-49bdf62243dccb6398bdac78b0eff9f1138b28fa.tar.gz
redmine-49bdf62243dccb6398bdac78b0eff9f1138b28fa.zip
Add autoscroll div for each file diff.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1015 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/repositories/diff.rhtml4
-rw-r--r--public/stylesheets/application.css2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index c1c33a495..de6cdc50c 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -11,9 +11,9 @@
<%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
<% end %>
-<div class="autoscroll">
<% cache(@cache_key) do %>
<% @diff.each do |table_file| %>
+<div class="autoscroll">
<% if @diff_type == 'sbs' %>
<table class="filecontent CodeRay">
<thead>
@@ -84,9 +84,9 @@
</tbody>
</table>
<% end %>
+</div>
<% end %>
<% end %>
-</div>
<% content_for :header_tags do %>
<%= stylesheet_link_tag "scm" %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8aa63d886..aa4b29712 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -123,7 +123,7 @@ hr { width: 100%; height: 1px; background: #ccc; border: 0;}
textarea.wiki-edit { width: 99%; }
li p {margin-top: 0;}
div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
-.autoscroll {overflow-x: auto; padding:1px; width:100%;}
+.autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
#user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
/***** Tabular forms ******/