Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-24 17:56:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2393 from TracksApp/dependabot/bundler/font-awesome-sass-5.13.0

Browse source 
Bump font-awesome-sass from 4.5.0 to 5.13.0
This commit is contained in:
Jyri-Petteri Paloposki 2020-08-19 12:33:12 +03:00 • committed by GitHub
commit 52cdab8146
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/icon_helper.rb
View file

@ -1,7 +1,7 @@
module IconHelper
include FontAwesome::Sass::Rails::ViewHelpers
def icon_fw(icon, text = nil, html_options = {})
def icon_fw(style, name, text = nil, html_options = {})
text, html_options = nil, text if text.is_a?(Hash)
if html_options.key?(:class)
@ -10,6 +10,6 @@ module IconHelper
html_options[:class] = "fa-fw"
end
icon(icon, text, html_options)
icon(style, name, text, html_options)
end
end

2
app/views/search/_index.html.erb
View file

@ -4,7 +4,7 @@
<%= text_field_tag(:search, params[:search], class: 'form-control') %>
<div class="input-group-btn">
<%= button_tag(type: 'submit', class: 'btn pull-right') do%>
<%= icon('search', class: 'hidden-xs') %>
<%= icon('fas', 'search', class: 'hidden-xs') %>
<% end %>
</div>
</div>

12
app/views/shared/_navbar.html.erb
View file

@ -63,20 +63,20 @@
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<%= icon('cog', class: 'hidden-xs') %>
<%= icon('fas', 'cog', class: 'hidden-xs') %>
<%= content_tag :span, t('layouts.navigation.options'), class: 'visible-xs-inline' %>
</a>
<ul class="dropdown-menu">
<li><%= link_to icon_fw('sign-out', t('common.logout')), logout_path %></li>
<li><%= link_to icon_fw('fas', 'sign-out', t('common.logout')), logout_path %></li>
<li class="divider"></li>
<li class="dropdown-header"><%= current_user.display_name %></li>
<li><%= link_to icon_fw('wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %></li>
<li><%= link_to icon_fw('download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %></li>
<li><%= link_to icon_fw('upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %></li>
<li><%= link_to icon_fw('fas', 'wrench', t('layouts.navigation.preferences')), preferences_path, accesskey: 'u', title: t('layouts.navigation.preferences_title') %></li>
<li><%= link_to icon_fw('fas', 'download', t('layouts.navigation.export')), data_path, accesskey: 'e', title: t('layouts.navigation.export_title') %></li>
<li><%= link_to icon_fw('fas', 'upload', t('layouts.navigation.import')), import_data_path, accesskey: 'i', title: t('layouts.navigation.import_title') %></li>
<% if current_user.is_admin? %>
<li class="divider"></li>
<li class="dropdown-header"><%= t('layouts.navigation.admin') %></li>
<li><%= link_to icon_fw('users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %></li>
<li><%= link_to icon_fw('fas', 'users', t('layouts.navigation.manage_users')), users_path, accesskey: 'a', title: t('layouts.navigation.manage_users_title') %></li>
<% end %>
</ul>
</li>