diff --git a/app/assets/stylesheets/shared_styles/elements/dropdown.scss b/app/assets/stylesheets/shared_styles/elements/dropdown.scss index 00edd0dbd..9c27c295f 100644 --- a/app/assets/stylesheets/shared_styles/elements/dropdown.scss +++ b/app/assets/stylesheets/shared_styles/elements/dropdown.scss @@ -127,4 +127,14 @@ color: $color-white; } } + + .h-34 { + height: 34px; + } + + .dropdown-switch-link { + + display: flex; + align-items: center; + } } diff --git a/app/javascript/vue/results/results_toolbar.vue b/app/javascript/vue/results/results_toolbar.vue index 05d74c38c..17cf26c69 100644 --- a/app/javascript/vue/results/results_toolbar.vue +++ b/app/javascript/vue/results/results_toolbar.vue @@ -6,6 +6,8 @@ {{ i18n.t('my_modules.results.add_label') }} + + diff --git a/app/javascript/vue/shared/reorderable_items_modal.vue b/app/javascript/vue/shared/reorderable_items_modal.vue index 164d90917..b6ed57d29 100644 --- a/app/javascript/vue/shared/reorderable_items_modal.vue +++ b/app/javascript/vue/shared/reorderable_items_modal.vue @@ -20,7 +20,7 @@
-
+
{{ index + 1 }} {{ nameWithFallbacks(item) }} diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb index ff23f7d52..ff3a0376e 100644 --- a/app/views/my_modules/status_flow/_task_flow_button.html.erb +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -49,7 +49,7 @@
"><%= previous_s.name %>
+ style="<%= "background-color: #{previous_s.color};" %> <%= "color: black !important;" if previous_s.color == "#FFFFFF" %>"><%= previous_s.name %>
<% previous_s_errors.each do |error| %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 4b23c3aea..1e094ea7e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3190,10 +3190,12 @@ en: step: title: Move to different step targets_label: Select step + search_placeholder: "Enter step name" result: title: Move to different result targets_label: Select result untitled_result: Untitled result + search_placeholder: "Enter result name" delete_step: title: 'Delete step' description_1: 'You’re about to delete a whole step from your protocol. It might contain data you don’t want to lose. You won’t be able to get it back.'