From f195cff339f539fe6119b4b2a222fceabee2d30d Mon Sep 17 00:00:00 2001 From: jfederico Date: Tue, 18 Oct 2016 18:12:11 -0400 Subject: [PATCH] Added icons to social buttons --- Gemfile | 1 + Gemfile.lock | 3 +++ app/assets/stylesheets/landing.scss | 2 ++ app/views/landing/index.html.erb | 13 +++++++++---- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3409daf9..88051b89 100644 --- a/Gemfile +++ b/Gemfile @@ -57,5 +57,6 @@ gem 'bigbluebutton-api-ruby' gem 'bootstrap-sass', '3.3.0.0' gem 'bootstrap-social-rails', '~> 4.12' +gem 'font-awesome-rails' gem 'jquery-ui-rails' gem 'jquery-datatables-rails', '~> 3.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index b24c67ff..e946530f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,6 +65,8 @@ GEM faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.14) + font-awesome-rails (4.6.3.1) + railties (>= 3.2, < 5.1) globalid (0.3.7) activesupport (>= 4.1.0) hashie (3.4.4) @@ -209,6 +211,7 @@ DEPENDENCIES byebug coffee-rails (~> 4.2) dotenv-rails + font-awesome-rails jbuilder (~> 2.5) jquery-datatables-rails (~> 3.4.0) jquery-rails diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss index 3bcfc498..48ad3a1c 100644 --- a/app/assets/stylesheets/landing.scss +++ b/app/assets/stylesheets/landing.scss @@ -5,6 +5,8 @@ // Bootstrap @import "bootstrap-sprockets"; @import "bootstrap"; +@import "bootstrap-social"; +@import "font-awesome"; .room { .room-link { diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb index 261fbf55..79b6e9b7 100644 --- a/app/views/landing/index.html.erb +++ b/app/views/landing/index.html.erb @@ -47,10 +47,15 @@