Skip to content

Commit

Permalink
Adds Fontawesome gem (#1462)
Browse files Browse the repository at this point in the history
Co-authored-by: JP Engstrom <[email protected]>
Co-authored-by: JP Engstrom <[email protected]>
  • Loading branch information
3 people authored Dec 4, 2024
1 parent 41c31c3 commit 35ba9b7
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 11 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ gem 'bootsnap', '>= 1.4.2', require: false
gem 'bootstrap', '~> 4.6'
gem 'coderay', '~> 1.1', '>= 1.1.3'
gem 'devise'
gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.8'
gem 'github_changelog_generator'
gem 'good_job', '~> 3.17'
gem 'honeybadger', '~> 4.0'
Expand Down
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ GEM
rake
fiber-annotation (0.2.0)
fiber-local (1.0.0)
font-awesome-rails (4.7.0.9)
railties (>= 3.2, < 9.0)
fugit (1.11.1)
et-orbi (~> 1, >= 1.2.11)
raabro (~> 1.4)
Expand Down Expand Up @@ -531,6 +533,7 @@ DEPENDENCIES
devise
factory_bot_rails
ffaker
font-awesome-rails (~> 4.7, >= 4.7.0.8)
github_changelog_generator
good_job (~> 3.17)
honeybadger (~> 4.0)
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
// @import 'theme/*';

@import 'theme/typography';
@import "font-awesome";

.main-content{
min-height: 90vh;
Expand Down
2 changes: 0 additions & 2 deletions app/javascript/packs/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ require("datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css")
require("datatables.net-select-bs4/css/select.bootstrap4.min.css")
require("datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css")

import "@fortawesome/fontawesome-free/js/all.js";

//= require jquery3
//= require popper
//= require bootstrap-sprockets
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1> Yale University Library </h1>
</div>
<div class="sub_yale_management_banner">
<a target="_blank" rel="noopener" href="https://docs.google.com/document/d/1hTc108JDYLYcXy-TG_KJE4A626-ps59XhkKUFGlnaPQ/edit?usp=sharing">User Guide <em class="fa fa-external-link-alt"></em></a>
<a target="_blank" rel="noopener" href="https://docs.google.com/document/d/1hTc108JDYLYcXy-TG_KJE4A626-ps59XhkKUFGlnaPQ/edit?usp=sharing">User Guide <i class="fa fa-link"></i></a>
<h2>Digital Library Management Portal</h2>
</div>
</div>
Expand Down
5 changes: 1 addition & 4 deletions spec/system/admin_set_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,7 @@
end

it "display admin edit form" do
visit admin_sets_path
within "tr#admin_set_#{admin_set.id}" do
page.find(:css, 'svg.fa-pencil').click
end
visit edit_admin_set_path(admin_set.id)
expect(find_field('Key').value).to eq('admin-set-key')
expect(find_field('Label').value).to eq('admin-set-label')
expect(find_field('Homepage').value).to eq('http://admin-set-homepage.com')
Expand Down
6 changes: 2 additions & 4 deletions spec/system/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@

describe 'are editable' do
it 'and require an email to be present' do
visit users_path
page.find(:css, 'svg.fa-pencil').click
visit edit_user_path(user.id)
expect(page).to have_content('Email')
fill_in('Email', with: '')
click_on('Update User')
Expand All @@ -87,8 +86,7 @@
end

it 'and require their full name to be present' do
visit users_path
page.find(:css, 'svg.fa-pencil').click
visit edit_user_path(user.id)
expect(page).to have_content('First name')
fill_in('First name', with: '')
click_on('Update User')
Expand Down

0 comments on commit 35ba9b7

Please sign in to comment.