Merge remote-tracking branch 'upstream/pull/2711'

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 6309444110a1206f7f22e57a2d54f02c3d5422ee..07ad64def19417bb117c5af89f5c03712cc4994d 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -49,15 +49,20 @@ OSM.initializeBrowse = function (map) {
 
   function displayFeatureWarning(count, limit, add, cancel) {
     $("#browse_status").html(
-      $("<p class='warning'></p>")
-        .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
-        .prepend(
-          $("<span class='icon close'></span>")
-            .click(cancel))
+      $("<div>")
         .append(
-          $("<input type='submit'>")
-            .val(I18n.t("browse.start_rjs.load_data"))
-            .click(add)));
+          $("<h2>")
+            .text(I18n.t("browse.start_rjs.load_data"))
+            .prepend($("<span class='icon close'></span>").click(cancel)))
+        .append(
+          $("<div class='inner12'>")
+            .append(
+              $("<p class='alert alert-warning clearfix'></p>")
+                .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })))
+            .append(
+              $("<input type='submit'>")
+                .val(I18n.t("browse.start_rjs.load_data"))
+                .click(add))));
   }
 
   var dataLoader;

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7c4053c4f48b722b3b74a6b05a70845bae9d668c..50bcf9be7b13124c05e9519154e974abf52db565 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -694,10 +694,6 @@ body.compact-nav {
 }
 
 #browse_status {
-  p {
-    padding: $lineheight;
-  }
-
   input {
     display: block;
     margin-left: auto;
@@ -1039,11 +1035,6 @@ tr.turn:hover {
     }
   }
 
-  .warning {
-    margin: 0 0 $lineheight/2 0;
-    padding: 0 $lineheight/2;
-  }
-
   .note-comments li, .changeset-comments li {
     margin: $lineheight/2 0;
 

diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb
index 2929e610ece6ebbf345b906509f7d7f769f2fc45..51633ffca5b6a24e183d6ea7b65fb83f1396d11a 100644 (file)
--- a/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@ -6,7 +6,7 @@
 </h2>
 
 <div class="note browse-section">
-  <p class="warning"><%= t("javascripts.notes.new.intro") %></p>
+  <p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
   <form action="#">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 0b91ca1264b4cc4520c607758703b97a187d35dd..74d1223c79b6c760208511de59bc96b308642c9a 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -12,15 +12,14 @@
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
-    <%= note_event("opened", @note.created_at, @note.author) %>
+    <p><%= note_event("opened", @note.created_at, @note.author) %></p>
     <% if @note.status == "closed" %>
-      <br />
-      <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
+      <p><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
     <% end %>
   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>
-    <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+    <p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
   <% end -%>
 
   <% if current_user && current_user != @note.author %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index f1eed33cf778bdc88e0d65653a2dd5e1fc4a8e59..2eb23f755102ed463c7517f2c4081841c8c37a64 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -24,7 +24,7 @@
   <p><%= t ".export_details_html" %></p>
 
   <div id="export_osm_too_large">
-    <p class="warning">
+    <p class="alert alert-warning">
       <%= t ".too_large.body" %>
     </p>
   </div>