Merged r18089 from trunk to 4.0-stable (#31268).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18090 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 90f6a85fa65db9b9f47cbab4a75aabb3a57c55ee..4206598cdd594429bd3d0506bfe2ce4a64e8f956 100644 (file)
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -137,13 +137,14 @@
   <%= content_tag(:div, :style => style, :class => "gantt_subjects_container") do %>
     <%
       style  = ""
-      style += "width: #{subject_width}px;"
+      style += "width: #{subject_width + 1}px;"
       style += "height: #{headers_height}px;"
       style += 'background: #eee;'
     %>
     <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
     <%
       style  = ""
+      style += "z-index: 1;"
       style += "width: #{subject_width}px;"
       style += "height: #{t_height}px;"
       style += 'border-left: 1px solid #c0c0c0;'

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4e64ed6adf458dfaf6ec50312fde5f6ba51f1221..1450997e05f78053609c9e88669864e29d771297 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1223,6 +1223,10 @@ div.wiki img {vertical-align:middle; max-width:100%;}
   overflow: hidden;
 }
 
+.gantt_subjects_column + td {
+  padding: 0;
+}
+
 .gantt_hdr.nwday {background-color:#f1f1f1; color:#999;}
 
 .gantt_subjects { font-size: 0.8em; }