Merge pull request #6261 from G-Chubinidze/gc_SCI_9269

CSS: Results revamp issues [SCI-9269]

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;
+  }
 }

app/javascript/vue/results/results_toolbar.vue

@@ -6,6 +6,8 @@
         {{ i18n.t('my_modules.results.add_label') }}
       </button>
     </div>
+
+
     <div class="dropdown view-switch" >
       <div class="btn btn-secondary view-switch-button prevent-shrink" id="viewSwitchButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
         <span v-if="archived" class="state-view-switch-btn-name">{{ i18n.t('my_modules.results.archived_results') }}</span>
@@ -13,13 +15,13 @@
         <span class="sn-icon sn-icon-down"></span>
       </div>
       <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="viewSwitchButton">
-        <li class="view-switch-active">
-          <a :href="active_url" :class="{'form-dropdown-state-item prevent-shrink': !archived}">
+        <li class="view-switch-active h-34">
+          <a class="h-34 dropdown-switch-link" :href="active_url" :class="{'form-dropdown-state-item prevent-shrink': !archived}">
             {{ i18n.t('my_modules.results.active_results') }}
           </a>
         </li>
-        <li class="view-switch-archived">
-          <a :href="archived_url" :class="{'form-dropdown-state-item prevent-shrink': archived}">
+        <li class="view-switch-archived h-34">
+          <a class="h-34 dropdown-switch-link" :href="archived_url" :class="{'form-dropdown-state-item prevent-shrink': archived}">
             {{ i18n.t('my_modules.results.archived_results') }}
           </a>
         </li>

app/javascript/vue/shared/content/modal/move.vue

@@ -19,9 +19,7 @@
               :options="targetOptions"
               :isLoading="false"
               :placeholder="
-                i18n.t(
-                  'my_modules.results.move_modal.search_placeholder'
-                )
+                i18n.t(`protocols.steps.modals.move_element.${parent_type}.search_placeholder`)
               "
               :no-options-placeholder="
                 i18n.t(
@@ -29,9 +27,7 @@
                 )
               "
               :searchPlaceholder="
-                i18n.t(
-                  'my_modules.results.move_modal.search_placeholder'
-                )
+                i18n.t(`protocols.steps.modals.move_element.${parent_type}.search_placeholder`)
               "
             />
           </div>

app/javascript/vue/shared/reorderable_items_modal.vue

@@ -20,7 +20,7 @@
               <div class="step-element-grip step-element-grip--draggable">
                 <i class="sn-icon sn-icon-drag"></i>
               </div>
-              <div class="step-element-name">
+              <div class="step-element-name text-center">
                 <strong v-if="includeNumbers" class="step-element-number">{{ index + 1 }}</strong>
                 <i v-if="item.attributes.icon" class="fas" :class="item.attributes.icon"></i>
                 <span :title="nameWithFallbacks(item)" v-if="nameWithFallbacks(item)">{{ nameWithFallbacks(item) }}</span>

app/views/my_modules/status_flow/_task_flow_button.html.erb

@@ -49,7 +49,7 @@
             <i class="fas fa-long-arrow-alt-right"></i>
             <div class="status-container">
               <div class="status-name <%= 'status-light' if previous_s.light_color? %>"
-                style="<%= "background-color: #{previous_s.color}" %>"><%= previous_s.name %></div>
+                style="<%= "background-color: #{previous_s.color};" %> <%= "color: black !important;" if previous_s.color == "#FFFFFF" %>"><%= previous_s.name %></div>
             </div>
           </li>
           <span class="error-message"><% previous_s_errors.each do |error| %>

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.'