From 7adef9cc9e4a3fdb748cfabc93bc92dd83eb89f0 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Thu, 13 Jun 2019 12:16:23 +0200
Subject: [PATCH] Change sort buttons positions

Closes SCI-3534
---
 .../stylesheets/protocol_management.scss      | 50 ++++++++++---------
 .../index/_external_protocols_tab.html.erb    | 14 +++---
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/protocol_management.scss b/app/assets/stylesheets/protocol_management.scss
index 43a3ae2a4..bfa9ac1c5 100644
--- a/app/assets/stylesheets/protocol_management.scss
+++ b/app/assets/stylesheets/protocol_management.scss
@@ -95,6 +95,32 @@
 
         .input-group-addon {
           background: $color-white;
+          color: $color-silver-chalice;
+        }
+      }
+    }
+  }
+
+  .protocol-sort {
+    padding-left: 7px;
+
+    span {
+      color: $color-silver-chalice;
+      font-size: 14px;
+    }
+
+    .btn-group {
+      margin-bottom: 10px;
+      margin-top: 6px;
+      padding-left: 3px;
+
+      label {
+        padding-bottom: 0;
+        padding-top: 0;
+
+        &.active {
+          background: $color-gainsboro;
+          border-radius: 5px;
           color: $color-emperor;
         }
       }
@@ -112,30 +138,6 @@
       margin-left: 0;
       margin-right: 0;
 
-      &.protocol-sort {
-        border-bottom: 1px solid $color-silver-chalice;
-
-        span {
-          color: $color-silver-chalice;
-          vertical-align: middle;
-        }
-
-        .btn-group {
-          margin-bottom: 10px;
-          margin-top: 10px;
-
-          label {
-            padding-bottom: 0;
-            padding-top: 0;
-
-            &.active {
-              background: $color-gainsboro;
-              border-radius: 5px;
-              color: $color-emperor;
-            }
-          }
-        }
-      }
     }
 
     // When no search result is present
diff --git a/app/views/protocols/index/_external_protocols_tab.html.erb b/app/views/protocols/index/_external_protocols_tab.html.erb
index a271620dd..5b64b40e4 100644
--- a/app/views/protocols/index/_external_protocols_tab.html.erb
+++ b/app/views/protocols/index/_external_protocols_tab.html.erb
@@ -22,12 +22,8 @@
           </div>
         <% end %>
       </div>
-    </div>
-
-
-    <div class='row main-protocol-panel'>
-      <div class='col-md-5 protocol-list-side-panel'>
-        <div class='row protocol-sort'>
+      <div class='col-md-7'>
+        <div class='protocol-sort'>
           <span><%= t('protocols.index.external_protocols.sort_by.title') %></span>
           <div class='btn-group' data-toggle='buttons' >
             <label class='btn btn-link active'>
@@ -45,6 +41,12 @@
           </label>
         </div>
       </div>
+      </div>
+    </div>
+
+
+    <div class='row main-protocol-panel'>
+      <div class='col-md-5 protocol-list-side-panel'>
 
       <div class='row empty-text'>
         <%= t('protocols.index.external_protocols.list_panel.empty_text') %>