From 1c966663e01abd3664544a913f86075ce63949fa Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 20 Jun 2018 15:18:05 -0400 Subject: [PATCH] switch feather for fontawesome --- Gemfile | 3 --- Gemfile.lock | 9 +-------- app/assets/stylesheets/_tabler-custom.scss | 2 +- app/assets/stylesheets/application.scss | 3 --- app/views/errors/internal_error.html.erb | 2 +- app/views/errors/not_found.html.erb | 2 +- app/views/errors/unprocessable.html.erb | 2 +- app/views/layouts/application.html.erb | 2 ++ app/views/main/index.html.erb | 2 +- app/views/rooms/show.html.erb | 2 +- app/views/shared/_header.html.erb | 6 +++--- .../shared/components/_public_recording_row.html.erb | 4 ++-- app/views/shared/components/_recording_row.html.erb | 10 +++++----- app/views/shared/components/_room_block.html.erb | 2 +- app/views/users/edit.html.erb | 6 +++--- 15 files changed, 23 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 2a7e0a48..8d98a1a6 100644 --- a/Gemfile +++ b/Gemfile @@ -53,9 +53,6 @@ gem 'bigbluebutton-api-ruby' gem 'bootstrap', '~> 4.1.1' gem 'tabler-rubygem' -# Fontawesome icons. -gem "font-awesome-sass", '~> 5.0.13' - # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/Gemfile.lock b/Gemfile.lock index 97de67ad..0477756c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,8 +79,6 @@ GEM faraday (0.12.2) multipart-post (>= 1.2, < 3) ffi (1.9.25) - font-awesome-sass (5.0.13) - sassc (>= 1.11) globalid (0.4.1) activesupport (>= 4.2.0) hashie (3.5.7) @@ -197,10 +195,6 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (1.11.4) - bundler - ffi (~> 1.9.6) - sass (>= 3.3.0) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) spring (2.0.2) @@ -251,7 +245,6 @@ DEPENDENCIES dotenv-rails factory_bot_rails faker - font-awesome-sass (~> 5.0.13) jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) @@ -275,4 +268,4 @@ DEPENDENCIES web-console (>= 3.3.0) BUNDLED WITH - 1.15.4 + 1.16.2 diff --git a/app/assets/stylesheets/_tabler-custom.scss b/app/assets/stylesheets/_tabler-custom.scss index 8a28ca2b..6cea629a 100644 --- a/app/assets/stylesheets/_tabler-custom.scss +++ b/app/assets/stylesheets/_tabler-custom.scss @@ -61,4 +61,4 @@ //@import "tabler/jvectormap"; //@import "tabler/selectize"; -@import "tabler/fonts/feather"; +//@import "tabler/fonts/feather"; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 63f739af..9f2d0d1a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -13,9 +13,6 @@ *= require_self */ -@import "font-awesome-sprockets"; -@import "font-awesome"; - @import "tabler/variables"; @import "bootstrap"; @import "tabler-custom"; diff --git a/app/views/errors/internal_error.html.erb b/app/views/errors/internal_error.html.erb index cf0411aa..c0cd592b 100644 --- a/app/views/errors/internal_error.html.erb +++ b/app/views/errors/internal_error.html.erb @@ -5,7 +5,7 @@

Oh no! Looks like something went wrong on our end.

The error has been logged, we'll take a look!

- Go back + Go back diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb index b20f70ac..5b975728 100644 --- a/app/views/errors/not_found.html.erb +++ b/app/views/errors/not_found.html.erb @@ -5,7 +5,7 @@

Whoops! Looks like we can't find that.

Is it possible its been removed?

- Go back + Go back diff --git a/app/views/errors/unprocessable.html.erb b/app/views/errors/unprocessable.html.erb index 41bb9ece..bbe004d5 100644 --- a/app/views/errors/unprocessable.html.erb +++ b/app/views/errors/unprocessable.html.erb @@ -5,7 +5,7 @@

Oops! Request is unprocessable.

Unforunately this isn't a valid request.

- Go back + Go back diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cb114d32..42fbcb9a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,6 +4,8 @@ Greenlight <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 7e1e41ea..06323800 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -5,7 +5,7 @@

A simple front end for your BigBlueButton Open Source Web Conferencing Server.

<%= link_to "https://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %> -

Watch a tutorial on using Greenlight

+

Watch a tutorial on using Greenlight

<% end %> diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb index 3bbd0384..79500e11 100644 --- a/app/views/rooms/show.html.erb +++ b/app/views/rooms/show.html.erb @@ -12,7 +12,7 @@
- +
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index d31353b0..61cef386 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -32,14 +32,14 @@ Home Room <% end %> <%= link_to edit_user_path(current_user), class: "dropdown-item" do %> - Settings + Settings <% end %>
- Need help? + Need help? <%= link_to logout_path, class: "dropdown-item" do %> - Sign out + Sign out <% end %> diff --git a/app/views/shared/components/_public_recording_row.html.erb b/app/views/shared/components/_public_recording_row.html.erb index cb4cdf1c..7350467f 100644 --- a/app/views/shared/components/_public_recording_row.html.erb +++ b/app/views/shared/components/_public_recording_row.html.erb @@ -28,9 +28,9 @@
<% if recording[:metadata][:"gl-listed"] == "true" %> - Public + Public <% else %> - Unlisted + Unlisted <% end %>
diff --git a/app/views/shared/components/_recording_row.html.erb b/app/views/shared/components/_recording_row.html.erb index 6c3657fa..887021ad 100644 --- a/app/views/shared/components/_recording_row.html.erb +++ b/app/views/shared/components/_recording_row.html.erb @@ -28,16 +28,16 @@
<% if recording[:metadata][:"gl-listed"] == "true" %> - + <% else %> - + <% end %>
<%= button_to update_recording_path(@room, record_id: recording[:recordID], state: "public"), class: "dropdown-item" do %> - Public + Public <% end %> <%= button_to update_recording_path(@room, record_id: recording[:recordID], state: "unlisted"), class: "dropdown-item" do %> - Unlisted + Unlisted <% end %>
@@ -49,7 +49,7 @@
- +
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb index 93c24bd9..69d4b2d9 100644 --- a/app/views/shared/components/_room_block.html.erb +++ b/app/views/shared/components/_room_block.html.erb @@ -23,7 +23,7 @@
- +
<%= link_to room, class: "dropdown-item" do %> Room Settings diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 82229586..27240083 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -5,17 +5,17 @@
<% if @user.social_uid.nil? %> <% end %>