summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/application.css2
-rw-r--r--app/views/imports/_issues_relations_mapping.html.erb20
2 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 378292f75..e994c12af 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1793,7 +1793,7 @@ table.gantt-table td {
width: 100%;
}
.gantt_subjects div.issue-subject:hover { background-color:#ffffdd; }
-.gantt_selected_column_content { padding-left: 3px; padding-right: 3px;}
+.gantt_selected_column_content > div { padding-left: 3px; box-sizing: border-box; }
.gantt_subjects .issue-subject img.icon-gravatar {
margin: 2px 5px 0px 2px;
}
diff --git a/app/views/imports/_issues_relations_mapping.html.erb b/app/views/imports/_issues_relations_mapping.html.erb
index fa0b0950f..9a88c6ebc 100644
--- a/app/views/imports/_issues_relations_mapping.html.erb
+++ b/app/views/imports/_issues_relations_mapping.html.erb
@@ -5,27 +5,27 @@
<%= mapping_select_tag @import, 'unique_id' %>
</p>
<p>
- <label for="import_settings_mapping_parent_issue_id"><%= l(:field_parent_issue) %></label>
+ <label for="import_mapping_parent_issue_id"><%= l(:field_parent_issue) %></label>
<%= mapping_select_tag @import, 'parent_issue_id' %>
</p>
<p>
- <label for="import_settings_mapping_relation_duplicates"><%= l(:label_duplicates) %></label>
+ <label for="import_mapping_relation_duplicates"><%= l(:label_duplicates) %></label>
<%= mapping_select_tag @import, 'relation_duplicates' %>
</p>
<p>
- <label for="import_settings_mapping_relation_duplicated"><%= l(:label_duplicated_by) %></label>
+ <label for="import_mapping_relation_duplicated"><%= l(:label_duplicated_by) %></label>
<%= mapping_select_tag @import, 'relation_duplicated' %>
</p>
<p>
- <label for="import_settings_mapping_relation_blocks"><%= l(:label_blocks) %></label>
+ <label for="import_mapping_relation_blocks"><%= l(:label_blocks) %></label>
<%= mapping_select_tag @import, 'relation_blocks' %>
</p>
<p>
- <label for="import_settings_mapping_relation_blocked"><%= l(:label_blocked_by) %></label>
+ <label for="import_mapping_relation_blocked"><%= l(:label_blocked_by) %></label>
<%= mapping_select_tag @import, 'relation_blocked' %>
</p>
</div>
@@ -33,27 +33,27 @@
<div class="splitcontentright">
<p></p>
<p>
- <label for="import_settings_mapping_relation_relates"><%= l(:label_relates_to) %></label>
+ <label for="import_mapping_relation_relates"><%= l(:label_relates_to) %></label>
<%= mapping_select_tag @import, 'relation_relates' %>
</p>
<p>
- <label for="import_settings_mapping_relation_precedes"><%= l(:label_precedes) %></label>
+ <label for="import_mapping_relation_precedes"><%= l(:label_precedes) %></label>
<%= mapping_select_tag @import, 'relation_precedes' %>
</p>
<p>
- <label for="import_settings_mapping_relation_follows"><%= l(:label_follows) %></label>
+ <label for="import_mapping_relation_follows"><%= l(:label_follows) %></label>
<%= mapping_select_tag @import, 'relation_follows' %>
</p>
<p>
- <label for="import_settings_mapping_relation_copied_to"><%= l(:label_copied_to) %></label>
+ <label for="import_mapping_relation_copied_to"><%= l(:label_copied_to) %></label>
<%= mapping_select_tag @import, 'relation_copied_to' %>
</p>
<p>
- <label for="import_settings_mapping_relation_copied_from"><%= l(:label_copied_from) %></label>
+ <label for="import_mapping_relation_copied_from"><%= l(:label_copied_from) %></label>
<%= mapping_select_tag @import, 'relation_copied_from' %>
</p>
</div>