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

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 17c36bdfe043066b81c518c9602546f3013af212..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 = {})
   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 = {})
   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
   end
 
   def dir


@@ -41,8 +41,8 @@ module ApplicationHelper
     end
   end
 
     end
   end
 

-  def current_page_class(path)
-    :current if current_page?(path)
+  def header_nav_link_class(path)
+    ["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"]

   end
 
   def application_data
   end
 
   def application_data