fix merge

1 files changed, 18 insertions, 0 deletions

diff --git a/app/assets/stylesheets/main/vehicle_journeys.css.scss b/app/assets/stylesheets/main/vehicle_journeys.css.scss
index c026923fb..f6e21ad68 100644
--- a/app/assets/stylesheets/main/vehicle_journeys.css.scss
+++ b/app/assets/stylesheets/main/vehicle_journeys.css.scss
@@ -38,6 +38,24 @@
 
 #workspace.vehicle_journeys.index
 {
+    #search{
+        .panel-heading .btn{
+            margin-left: 20px;
+        }
+        
+        ul.token-input-list{
+            display: inline-block;
+            vertical-align: middle;
+            margin-left: 20px;
+            width: 250px;
+        }
+
+        .advanced_search_link{
+            vertical-align: -webkit-baseline-middle;
+        }
+        
+    }
+    
     table{
 
         margin: 20px 0 0 0;