cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-04-28 18:39:50 +01:00
commit fa0f31c83c
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/common.scss
View file

@ -21,11 +21,6 @@ time[title] {
#container { position: relative; } #container { position: relative; }
.small_icon {
vertical-align: middle;
margin-right: $lineheight * 0.25;
}
/* Rules for icons */ /* Rules for icons */
.icon { .icon {

4
app/helpers/application_helper.rb
View file

@ -10,11 +10,11 @@ module ApplicationHelper
end end
def rss_link_to(args = {}) 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 end
def atom_link_to(args = {}) 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 end
def dir def dir

2
app/views/diary_entries/index.html.erb
View file

@ -25,7 +25,7 @@
<% end %> <% end %>
<% if @user && @user == current_user || !@user && current_user %> <% 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 %> <% end %>
</ul> </ul>
</nav> </nav>

4
test/helpers/application_helper_test.rb
View file

@ -31,12 +31,12 @@ class ApplicationHelperTest < ActionView::TestCase
def test_rss_link_to def test_rss_link_to
link = rss_link_to(:controller => :diary_entries, :action => :rss) 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 end
def test_atom_link_to def test_atom_link_to
link = atom_link_to(:controller => :changesets, :action => :feed) 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 end
def test_dir def test_dir