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.

Sign up for GitHub

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

Jump to bottom

Remove font-awesome references #249

Merged
merged 2 commits into from
Nov 19, 2018
Merged

Remove font-awesome references #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fac600
Remove font-awesome references
jrochkind Nov 19, 2018
abe6ed3
Merge branch 'master' into remove_font_awesome
mbklein Nov 19, 2018
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
2 changes: 0 additions & 2 deletions app/assets/stylesheets/browse_everything.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import 'bootstrap-sprockets';
@import 'bootstrap';

@import "font-awesome";

@import "browse_everything/browse_everything";
17 changes: 0 additions & 17 deletions app/helpers/font_awesome_version_helper.rb
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/browse_everything/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<span class="loading-text">Loading...</span>
</div>
<div class="ev-browser row" aria-live="polite">
<div class="<%=fa3or4('fa3','fa4')%> col-xs-12 ev-files list">
<div class="col-xs-12 ev-files list">
<% if provider.present? %>
<% if provider.authorized? %>
<%= render :partial => 'files' %>
Expand Down
1 change: 0 additions & 1 deletion browse-everything.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
spec.add_dependency 'aws-sdk-s3'
spec.add_dependency 'bootstrap-sass', '~> 3.2'
spec.add_dependency 'dropbox_api', '>= 0.1.10'
spec.add_dependency 'font-awesome-rails'
spec.add_dependency 'google-api-client', '~> 0.23'
spec.add_dependency 'google_drive', '~> 2.1'
spec.add_dependency 'googleauth', '0.6.6'
Expand Down
1 change: 0 additions & 1 deletion lib/browse-everything.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# frozen_string_literal: true

require 'bootstrap-sass'
require 'font-awesome-rails'
require 'browse_everything'
2 changes: 0 additions & 2 deletions lib/generators/browse_everything/templates/browse_everything.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import 'bootstrap-sprockets';
@import 'bootstrap';

@import "font-awesome";

@import "browse_everything/browse_everything";