From dff0eef78737dc54eb227af2080e80ecdd3e3999 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Mar 2017 19:51:01 +0000
Subject: [PATCH 1/1] Remove inline styles

---
 app/assets/stylesheets/common.scss | 30 +++++++++++++++++++++++++++++-
 app/views/layouts/map.html.erb     |  2 +-
 app/views/layouts/site.html.erb    |  2 +-
 app/views/oauth/authorize.html.erb |  2 +-
 app/views/site/export.html.erb     |  2 +-
 app/views/trace/view.html.erb      |  4 ++--
 app/views/user/_terms.html.erb     |  2 +-
 7 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index bb0e6f0d4..47e76fceb 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -148,6 +148,8 @@ small, aside {
 
 .red { color: $red; }
 
+.piwik { border: 0; }
+
 /* Rules for icons */
 
 .icon {
@@ -604,7 +606,7 @@ body.compact {
       display: block;
     }
 
-    #sidebar_content {
+    #sidebar_loader, #sidebar_content {
       display: none;
     }
   }
@@ -1477,6 +1479,18 @@ tr.turn:hover {
   }
 }
 
+/* Rules for the trace view */
+
+.trace-view {
+  .trace_pending {
+    color: red;
+  }
+
+  .geo {
+    display: inline;
+  }
+}
+
 /* Rules for the new trace form */
 
 #new_trace {
@@ -1709,6 +1723,14 @@ tr.turn:hover {
     margin-bottom: $lineheight;
     overflow: auto;
     height: 20em;
+
+    li {
+      list-style: inherit;
+    }
+
+    ol ol {
+      list-style-type: lower-alpha;
+    }
   }
 
   #decline {
@@ -1767,6 +1789,12 @@ tr.turn:hover {
   border-radius: 0 2px 2px 0;
 }
 
+/* Rules for the oauth authorization page */
+
+.oauth-authorize ul {
+  list-style: none;
+}
+
 /* Rules for messages pages */
 
 .messages {
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 3f11edf59..9cd4f8a64 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -36,7 +36,7 @@
 
     <div id="browse_status"></div>
 
-    <div id="sidebar_loader" style="display: none;">
+    <div id="sidebar_loader">
       <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
     </div>
 
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 69ac7aa02..1e1e23ebb 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -5,7 +5,7 @@
     <%= render :partial => "layouts/header" %>
     <%= render :partial => "layouts/content" %>
     <% if defined?(PIWIK) -%>
-    <noscript><p><img src="<%= request.protocol %><%= PIWIK['location'] %>/piwik.php?idsite=<%= PIWIK['site'] %>" style="border:0" alt="" /></p></noscript>
+    <noscript><p><img src="<%= request.protocol %><%= PIWIK['location'] %>/piwik.php?idsite=<%= PIWIK['site'] %>" class="piwik" alt="" /></p></noscript>
     <% end -%>
   </body>
 </html>
diff --git a/app/views/oauth/authorize.html.erb b/app/views/oauth/authorize.html.erb
index 565d13808..c0271350d 100644
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -10,7 +10,7 @@
     <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
   <%- end -%>
   <p><%= t 'oauth.oauthorize.allow_to' %></p>
-  <ul style="list-style:none">
+  <ul>
   <% @token.client_application.permissions.each do |perm| %>
     <li><%= check_box_tag perm.to_s, "yes", @token.read_attribute(perm) %><%= t "oauth.oauthorize.#{perm}" %></li>
   <% end %>
diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 9ac03e70d..128db5992 100644
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -9,7 +9,7 @@
   <%= hidden_field_tag 'format', 'osm' %>
 
   <div class='export_area_inputs'>
-    <div class='export_boxy' style="border: 1px solid #ccc;">
+    <div class='export_boxy'>
       <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
       <br/>
       <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index fac0139d9..dda78f954 100644
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -6,7 +6,7 @@
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
   <% else %>
-    <span style="color:red"><%= t'trace.view.pending' %></span>
+    <span class="trace_pending"><%= t'trace.view.pending' %></span>
   <% end %>
 <% end %>
 
@@ -25,7 +25,7 @@
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td><%= t'trace.view.start_coordinates' %></td>
-    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
+    <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
   </tr>
   <% end %>
   <tr>
diff --git a/app/views/user/_terms.html.erb b/app/views/user/_terms.html.erb
index 11c3f5049..ad0b74166 100644
--- a/app/views/user/_terms.html.erb
+++ b/app/views/user/_terms.html.erb
@@ -7,7 +7,7 @@
   <li>
     <p><%= raw @text['section_1'] %></p>
     <% unless @text['section_1a'].nil? %>
-    <ol style="list-style-type: lower-alpha">
+    <ol>
       <li><%= raw @text['section_1a'] %></li>
       <li><%= raw @text['section_1b'] %></li>
     </ol>
-- 
2.43.2