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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7871e8a41ab3f1c67fcb934194347fae8596d883..d8f13287bf5b53f6127178beb7945f3b8a5c02a4 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -16,11 +16,6 @@ time[title] {
 
 #container { position: relative; }
 
-.small_icon {
-  vertical-align: middle;
-  margin-right: $lineheight * 0.25;
-}
-
 /* Rules for icons */
 
 .icon {
@@ -924,11 +919,6 @@ div.secondary-actions {
   .sprite.rules {
     /*rtl:ignore*/ background-position: -350px 0;
   }
-
-  .icon.note {
-    background-color: #333;
-    border-radius: 4px;
-  }
 }
 
 .site-about #content {

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 368668a9bbf4fbb5c82637595ab0a09560032d56..fcf253289ea45ff65e11f0f30c5909146bfa1f10 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -10,11 +10,11 @@ module ApplicationHelper
   end
 
   def rss_link_to(args = {})
-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
+    link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args
   end
 
   def atom_link_to(args = {})
-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
+    link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args
   end
 
   def dir

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 78ac0dcf869976bf05d4a020172e1e2c0202b90e..a0ab0264a4f7383e73d850779d6c5d0aea2aa136 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -25,7 +25,7 @@
           <% end %>
 
           <% if @user && @user == current_user || !@user && current_user %>
-            <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
+            <li><%= link_to image_tag("new.png") + t(".new"), new_diary_entry_path, :class => "icon-link", :title => t(".new_title") %></li>
           <% end %>
         </ul>
       </nav>

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index c1a61362fdaa36ce61cb41610acc56b9e02b9a16..3edafd8b7fc8ac99ff0b5bec2d768056a8e7c3b7 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -22,7 +22,7 @@
   <div class='col-sm'>
     <h5><%= t "site.welcome.add_a_note.title" %></h5>
     <p><%= t "site.welcome.add_a_note.para_1" %></p>
-    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note") %></p>
+    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1") %></p>
   </div>
 </div>
 

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 8ec32ea9c86e8446f870b9f3506ccec2158cf17a..f8f339284f222246ee303fae979dcdee80fc1689 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -73,5 +73,5 @@
   <h2><%= t ".add_a_note.title" %></h2>
   <p><%= t ".add_a_note.para_1" %></p>
   <p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),
-                                      :note_icon => tag.span(:class => "icon note") %></p>
+                                      :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %></p>
 </div>

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index a905090dba6133a8c20908f8ee308a6fbb817015..24d74c85f3b0ad5d1a06aaad93f8eaf6f4739e2d 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -31,12 +31,12 @@ class ApplicationHelperTest < ActionView::TestCase
 
   def test_rss_link_to
     link = rss_link_to(:controller => :diary_entries, :action => :rss)
-    assert_dom_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+    assert_dom_equal "<a href=\"/diary/rss\"><img height=\"16\" src=\"/images/RSS.png\" width=\"16\" class=\"align-text-bottom\" /></a>", link
   end
 
   def test_atom_link_to
     link = atom_link_to(:controller => :changesets, :action => :feed)
-    assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+    assert_dom_equal "<a href=\"/history/feed\"><img height=\"16\" src=\"/images/RSS.png\" width=\"16\" class=\"align-text-bottom\" /></a>", link
   end
 
   def test_dir