Merged r16556 (#25745).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16564 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-05-27 07:35:50 +00:00
parent 996cb52bee
commit abf454c248
2 changed files with 29 additions and 2 deletions

View File

@@ -121,14 +121,14 @@
<table style="width:100%; border:0; border-collapse: collapse;"> <table style="width:100%; border:0; border-collapse: collapse;">
<tr> <tr>
<td style="width:<%= subject_width %>px; padding:0px;"> <td style="width:<%= subject_width %>px; padding:0px;" class="gantt_subjects_column">
<% <%
style = "" style = ""
style += "position:relative;" style += "position:relative;"
style += "height: #{t_height + 24}px;" style += "height: #{t_height + 24}px;"
style += "width: #{subject_width + 1}px;" style += "width: #{subject_width + 1}px;"
%> %>
<%= content_tag(:div, :style => style) do %> <%= content_tag(:div, :style => style, :class => "gantt_subjects_container") do %>
<% <%
style = "" style = ""
style += "right:-2px;" style += "right:-2px;"

View File

@@ -676,6 +676,33 @@
padding-top: 1em; padding-top: 1em;
} }
/* Gantt charts */
/*
* [1] override inline styles with important
* [2] keep border between subjects and gantt area
* [3] remove whitespace between subjects and gantt area
* [4] maintain width due to [3]
*/
.gantt_subjects_column {
width: 60% !important; /* [1] */
}
.gantt_subjects_container {
width: 100% !important;
overflow: hidden;
}
.gantt_subjects_column .gantt_hdr {
width: 100% !important;
border-right: 1px solid #c0c0c0; /* [2] */
right: 0 !important; /* [2] */
}
#gantt_area {
left: -2px; /* [3] */
margin-right: -2px; /* [4] */
}
/*----------------------------------------*\ /*----------------------------------------*\
G) FORMS G) FORMS
\*----------------------------------------*/ \*----------------------------------------*/