From: Tom Hughes <tom@compton.nu>
Date: Mon, 16 Mar 2015 20:29:40 +0000 (+0000)
Subject: Remove inline styling
X-Git-Tag: live~4119
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d73a4efef0311ae7fe0afe4bd895d74ba4be2c4c?ds=sidebyside

Remove inline styling
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 834e811c6..9fbca6171 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -921,10 +921,23 @@ header .search_forms,
     float: right;
   }
 
+  div.header {
+    width: 100%;
+    height: 30px;
+  }
+
   div.line {
     width: 100%;
     margin: 0px 0px 5px 0px;
   }
+
+  div.loader_copy {
+    display: none;
+
+    img {
+      vertical-align: middle;
+    }
+  }
 }
 
 /* Rules for the map key which appears in the popout sidebar */
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 5a40e02df..a9a7aee00 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -9,7 +9,7 @@
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form">
-    <div style="width:100%; text-align:right; height:30px;"><span class="icon close"></span></div>
+    <div class="header"><span class="icon close"></span></div>
 
     <div class="line">
       <%= image_tag "marker-green.png", :class => "routing_marker", :id => "marker_from", :draggable => "true" %>
@@ -24,6 +24,6 @@
       <%= submit_tag t('site.search.submit_text'), :class => "routing_go" %>
     </div>
 
-    <div class="loader_copy" style="display:none;"><div class="loader"><%= image_tag "searching.gif", :style => "vertical-align: middle;" %></div></div>
+    <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
   </form>
 </div>