diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-11-28 09:01:49 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-11-28 09:01:49 +0000 |
| commit | fe976455b448e1ebb19ed012bf8b3dabcb3d2676 (patch) | |
| tree | 505a26b96ff57da760be7ae9b70877b965ae41a7 | |
| parent | 5e9b2e9d9214394586ae024e38e4458006dbc711 (diff) | |
| download | redmine-fe976455b448e1ebb19ed012bf8b3dabcb3d2676.tar.gz redmine-fe976455b448e1ebb19ed012bf8b3dabcb3d2676.zip | |
Table layout breaks due to .icon class on td elements (#41873).
Patch by Mizuki ISHIKAWA (user:ishikawa999) and Katsuya HIDAKA (user:hidakatsuya).
git-svn-id: https://svn.redmine.org/redmine/trunk@23317 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/assets/stylesheets/application.css | 2 | ||||
| -rw-r--r-- | app/views/boards/show.html.erb | 10 | ||||
| -rw-r--r-- | app/views/projects/settings/_versions.html.erb | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 88afa5d0c..1c9595172 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -428,7 +428,7 @@ body.avatars-on #replies .message.reply {padding-left: 32px;} #replies h4 img.gravatar {margin-left:-32px;} tr.version.closed, tr.version.closed a { color: #999; } -tr.version td.name:not(.icon-shared) { padding-left: 20px; } +tr.version:not(.shared) td.name { padding-left: 20px; } tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; } tr.member td.icon-user, #principals_for_new_member .icon-user {background:transparent;} diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index b2aff9a53..2fd6c6005 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -38,10 +38,12 @@ <tbody> <% @topics.each do |topic| %> <tr id="message-<%= topic.id %>" class="message <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"> - <td class="subject icon <%= 'icon-sticky' if topic.sticky? %> <%= 'icon-locked' if topic.locked? %>"> - <%= sprite_icon "arrow-right" if topic.sticky? %> - <%= sprite_icon "lock" if topic.locked? %> - <%= link_to topic.subject, board_message_path(@board, topic) %> + <td class="subject"> + <span class="<%= 'icon' if topic.sticky? || topic.locked? %>"> + <%= sprite_icon "arrow-right" if topic.sticky? %> + <%= sprite_icon "lock" if topic.locked? %> + <%= link_to topic.subject, board_message_path(@board, topic) %> + </span> </td> <td class="author"><%= link_to_user(topic.author) %></td> <td class="created_on"><%= format_time(topic.created_on) %></td> diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index 5af6a1f4b..3894d4bd0 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -35,9 +35,11 @@ <% @versions.each do |version| %> <tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>"> <% is_shared = version.project != @project %> - <td class="name <%= 'icon icon-shared' if is_shared %>"> - <%= sprite_icon('link') if is_shared %> - <%= link_to_version version %> + <td class="name"> + <span class="<%= 'icon' if is_shared %>"> + <%= sprite_icon('link') if is_shared %> + <%= link_to_version version %> + </span> </td> <td class="tick"><%= checked_image(version.id == @project.default_version_id) %></td> <td class="date"><%= format_date(version.effective_date) %></td> |