Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Font Awesome from 4 to 5.15.4 #2324

Merged
merged 1 commit into from
Dec 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
3,717 changes: 3,717 additions & 0 deletions src/supermarket/app/assets/fonts/fa-brands-400.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
801 changes: 801 additions & 0 deletions src/supermarket/app/assets/fonts/fa-regular-400.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5,034 changes: 5,034 additions & 0 deletions src/supermarket/app/assets/fonts/fa-solid-900.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 8 additions & 1 deletion src/supermarket/app/assets/stylesheets/appheader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,17 @@
width: rem-calc(40);
}

.fa {
i {
font-size: rem-calc(16);
margin-left: rem-calc(5);
}

a {
i.fa {
font-size: 0.75rem;
margin-left: rem-calc(5);
}
}
}

@media #{$mobile-only} {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*= require_tree ./cookbooks
*= require_tree ./profile
*= require_tree ./tools
*= require_tree ./font_awesome
*= require tabs
*= require dashboard
*= require contribute
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/supermarket/app/views/application/_appheader.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<%= gravatar_for current_user, size: 80 %>
<%= current_user.username %> <i class="fa fa-caret-down"></i>
<ul class="userdropdown">
<li><%= link_to 'View Profile', current_user, class: 'fa fa-user', rel: 'view_profile' %></li>
<li><%= link_to 'Manage Profile', edit_profile_path, class: 'fa fa-cog', rel: 'manage_profile' %></li>
<li><%= link_to '<i class="fa fa-user"></i> View Profile'.html_safe, current_user, rel: 'view_profile' %></li>
<li><%= link_to '<i class="fa fa-cog"></i> Manage Profile'.html_safe, edit_profile_path, rel: 'manage_profile' %></li>

<li><%= link_to 'Sign Out', sign_out_path, :class => 'fa fa-power-off', method: :delete, rel: 'sign_out' %></li>
<li><%= link_to '<i class="fa fa-power-off"></i> Sign Out'.html_safe, sign_out_path, method: :delete, rel: 'sign_out' %></li>
</ul>
<% end %>
</div>
Expand Down
3 changes: 1 addition & 2 deletions src/supermarket/app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<link rel="apple-touch-icon" href="<%= image_url('apple-touch-icon.png') %>"/>
<%= stylesheet_link_tag "application", media: "all" %>
<% unless Rails.env == 'test' || air_gapped? %>
<%= stylesheet_link_tag "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" %>
<%= stylesheet_link_tag "//fonts.googleapis.com/css?family=Montserrat:400,700" %>
<% end %>
<%= csrf_meta_tags %>
Expand Down Expand Up @@ -47,7 +46,7 @@
</aside>

<header class="globalheader">
<a class="left-off-canvas-toggle fa fa-bars"><span class="hide">Menu</span></a>
<a class="left-off-canvas-toggle"><i class="fa fa-bars"></i><span class="hide">Menu</span></a>
<div class="inner_wrap">
<div class="logo_and_nav_toggle">
<h2 class="logochef"><%= link_to root_path do %><span>Chef Supermarket</span><% end %></h2>
Expand Down