diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-05-17 01:25:05 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-05-17 01:25:05 +0000 |
| commit | a6ca51786ddfb077ba61bfdb69271b7104fca94a (patch) | |
| tree | e784173ed30b2474dfbd2601c2d5e5a0e8a4bb44 | |
| parent | 0328b5671abc0fdfce1a97bde4897f7a72d9dcd4 (diff) | |
| download | redmine-a6ca51786ddfb077ba61bfdb69271b7104fca94a.tar.gz redmine-a6ca51786ddfb077ba61bfdb69271b7104fca94a.zip | |
Fix broken gantt layout due to r18171 (#27672).
Patch by Mizuki ISHIKAWA.
git-svn-id: http://svn.redmine.org/redmine/trunk@18172 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/gantts/show.html.erb | 6 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 5 | ||||
| -rw-r--r-- | public/stylesheets/responsive.css | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 999f8f816..f9c35ebc9 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -141,12 +141,12 @@ <table class='gantt-table'> <tr> -<td style="width:<%= subject_width %>px;" class="gantt_subjects_column"> +<td style="width:<%= @query.draw_selected_columns ? subject_width + 1 : subject_width + 2 %>px;" class="gantt_subjects_column"> <% style = "" style += "position:relative;" style += "height: #{t_height + 24}px;" - style += "width: #{subject_width}px;" + style += "width: #{subject_width + 1}px;" %> <%= content_tag(:div, :style => style, :class => "gantt_subjects_container #{'draw_selected_columns' if @query.draw_selected_columns}") do %> <% @@ -159,7 +159,7 @@ <% style = "" style += "z-index: 1;" - style += "width: #{subject_width}px;" + style += "width: #{subject_width + 1}px;" style += "height: #{t_height}px;" style += 'overflow: hidden;' %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 3f17d28c9..f4f4a8f78 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1331,9 +1331,12 @@ table.gantt-table td { white-space: nowrap; } -td.gantt_selected_column, td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container { +td.gantt_selected_column { width: 50px; } +td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container { + width: 49px; +} .task { position: absolute; diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css index 6bec53560..aa5502ee6 100644 --- a/public/stylesheets/responsive.css +++ b/public/stylesheets/responsive.css @@ -712,6 +712,7 @@ .gantt_subjects_column .gantt_hdr { width: 100% !important; right: 0 !important; /* [2] */ + border-right: solid 1px #c0c0c0; } #gantt_area { |