lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch feather for fontawesome

This commit is contained in:
Josh 2018-06-20 15:18:05 -04:00
parent e1eca134fc
commit 1c966663e0
15 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -53,9 +53,6 @@ gem 'bigbluebutton-api-ruby'
gem 'bootstrap', '~> 4.1.1' gem 'bootstrap', '~> 4.1.1'
gem 'tabler-rubygem' gem 'tabler-rubygem'
# Fontawesome icons.
gem "font-awesome-sass", '~> 5.0.13'
# Use Capistrano for deployment # Use Capistrano for deployment
# gem 'capistrano-rails', group: :development # gem 'capistrano-rails', group: :development

9
Gemfile.lock
View File

@ -79,8 +79,6 @@ GEM
faraday (0.12.2) faraday (0.12.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.25) ffi (1.9.25)
font-awesome-sass (5.0.13)
sassc (>= 1.11)
globalid (0.4.1) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
hashie (3.5.7) hashie (3.5.7)
@ -197,10 +195,6 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sassc (1.11.4)
bundler
ffi (~> 1.9.6)
sass (>= 3.3.0)
shoulda-matchers (3.1.2) shoulda-matchers (3.1.2)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
spring (2.0.2) spring (2.0.2)
@ -251,7 +245,6 @@ DEPENDENCIES
dotenv-rails dotenv-rails
factory_bot_rails factory_bot_rails
faker faker
font-awesome-sass (~> 5.0.13)
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-rails jquery-rails
listen (~> 3.0.5) listen (~> 3.0.5)
@ -275,4 +268,4 @@ DEPENDENCIES
web-console (>= 3.3.0) web-console (>= 3.3.0)
BUNDLED WITH BUNDLED WITH
1.15.4 1.16.2

2
app/assets/stylesheets/_tabler-custom.scss
View File

@ -61,4 +61,4 @@
//@import "tabler/jvectormap"; //@import "tabler/jvectormap";
//@import "tabler/selectize"; //@import "tabler/selectize";
@import "tabler/fonts/feather"; //@import "tabler/fonts/feather";

3
app/assets/stylesheets/application.scss
View File

@ -13,9 +13,6 @@
*= require_self *= require_self
*/ */
@import "font-awesome-sprockets";
@import "font-awesome";
@import "tabler/variables"; @import "tabler/variables";
@import "bootstrap"; @import "bootstrap";
@import "tabler-custom"; @import "tabler-custom";

2
app/views/errors/internal_error.html.erb
View File

@ -5,7 +5,7 @@
<h1 class="h2 mb-3">Oh no! Looks like something went wrong on our end.</h1> <h1 class="h2 mb-3">Oh no! Looks like something went wrong on our end.</h1>
<p class="h4 text-muted font-weight-normal mb-7">The error has been logged, we'll take a look!</p> <p class="h4 text-muted font-weight-normal mb-7">The error has been logged, we'll take a look!</p>
<a class="btn btn-primary" href="javascript:history.back()"> <a class="btn btn-primary" href="javascript:history.back()">
<i class="fe fe-arrow-left mr-2"></i>Go back <i class="fas fa-arrow-left mr-2"></i>Go back
</a> </a>
</div> </div>
</div> </div>

2
app/views/errors/not_found.html.erb
View File

@ -5,7 +5,7 @@
<h1 class="h2 mb-3">Whoops! Looks like we can't find that.</h1> <h1 class="h2 mb-3">Whoops! Looks like we can't find that.</h1>
<p class="h4 text-muted font-weight-normal mb-7">Is it possible its been removed?</p> <p class="h4 text-muted font-weight-normal mb-7">Is it possible its been removed?</p>
<a class="btn btn-primary" href="javascript:history.back()"> <a class="btn btn-primary" href="javascript:history.back()">
<i class="fe fe-arrow-left mr-2"></i>Go back <i class="fas fa-arrow-left mr-2"></i>Go back
</a> </a>
</div> </div>
</div> </div>

2
app/views/errors/unprocessable.html.erb
View File

@ -5,7 +5,7 @@
<h1 class="h2 mb-3">Oops! Request is unprocessable.</h1> <h1 class="h2 mb-3">Oops! Request is unprocessable.</h1>
<p class="h4 text-muted font-weight-normal mb-7">Unforunately this isn't a valid request.</p> <p class="h4 text-muted font-weight-normal mb-7">Unforunately this isn't a valid request.</p>
<a class="btn btn-primary" href="javascript:history.back()"> <a class="btn btn-primary" href="javascript:history.back()">
<i class="fe fe-arrow-left mr-2"></i>Go back <i class="fas fa-arrow-left mr-2"></i>Go back
</a> </a>
</div> </div>
</div> </div>

2
app/views/layouts/application.html.erb
View File

@ -4,6 +4,8 @@
<title>Greenlight</title> <title>Greenlight</title>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>

2
app/views/main/index.html.erb
View File

@ -5,7 +5,7 @@
<h4 class="text-muted">A simple front end for your BigBlueButton Open Source Web Conferencing Server.</h4> <h4 class="text-muted">A simple front end for your BigBlueButton Open Source Web Conferencing Server.</h4>
<%= link_to "https://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %> <%= link_to "https://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %>
<h4>Watch a tutorial on using Greenlight <i class="fe fe-play-circle"></i></h4> <h4>Watch a tutorial on using Greenlight <i class="far fa-play-circle"></i></h4>
<% end %> <% end %>
</div> </div>
</div> </div>

2
app/views/rooms/show.html.erb
View File

@ -12,7 +12,7 @@
<form class="form-inline"> <form class="form-inline">
<div class="input-icon invite-link-input"> <div class="input-icon invite-link-input">
<span class="input-icon-addon"> <span class="input-icon-addon">
<i class="fe fe-link"></i> <i class="fas fa-link"></i>
</span> </span>
<input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly=""> <input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly="">
</div> </div>

6
app/views/shared/_header.html.erb
View File

@ -32,14 +32,14 @@
<i class="dropdown-icon fas fa-home"></i> Home Room <i class="dropdown-icon fas fa-home"></i> Home Room
<% end %> <% end %>
<%= link_to edit_user_path(current_user), class: "dropdown-item" do %> <%= link_to edit_user_path(current_user), class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-settings"></i> Settings <i class="dropdown-icon fas fa-cog"></i> Settings
<% end %> <% end %>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="http://docs.bigbluebutton.org/support/faq.html"> <a class="dropdown-item" href="http://docs.bigbluebutton.org/support/faq.html">
<i class="dropdown-icon fe fe-help-circle"></i> Need help? <i class="dropdown-icon far fa-question-circle"></i> Need help?
</a> </a>
<%= link_to logout_path, class: "dropdown-item" do %> <%= link_to logout_path, class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-log-out"></i> Sign out <i class="dropdown-icon fas fa-sign-out-alt"></i> Sign out
<% end %> <% end %>
</div> </div>
</div> </div>

4
app/views/shared/components/_public_recording_row.html.erb
View File

@ -28,9 +28,9 @@
<td class="text-left"> <td class="text-left">
<div class="dropdown"> <div class="dropdown">
<% if recording[:metadata][:"gl-listed"] == "true" %> <% if recording[:metadata][:"gl-listed"] == "true" %>
<i class="dropdown-icon fe fe-globe px-2"></i> Public <i class="dropdown-icon fas fa-globe px-2"></i> Public
<% else %> <% else %>
<i class="dropdown-icon fe fe-link px-2"></i> Unlisted <i class="dropdown-icon fas fa-link px-2"></i> Unlisted
<% end %> <% end %>
</div> </div>
</td> </td>

10
app/views/shared/components/_recording_row.html.erb
View File

@ -28,16 +28,16 @@
<td class="text-left"> <td class="text-left">
<div class="dropdown"> <div class="dropdown">
<% if recording[:metadata][:"gl-listed"] == "true" %> <% if recording[:metadata][:"gl-listed"] == "true" %>
<button class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown"><i class="dropdown-icon fe fe-globe px-2"></i> Public</button> <button class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown"><i class="dropdown-icon fas fa-globe px-2"></i> Public</button>
<% else %> <% else %>
<button class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown"><i class="dropdown-icon fe fe-link px-2"></i> Unlisted</button> <button class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown"><i class="dropdown-icon fas fa-link px-2"></i> Unlisted</button>
<% end %> <% end %>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<%= button_to update_recording_path(@room, record_id: recording[:recordID], state: "public"), class: "dropdown-item" do %> <%= button_to update_recording_path(@room, record_id: recording[:recordID], state: "public"), class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-globe"></i> Public <i class="dropdown-icon fas fa-globe"></i> Public
<% end %> <% end %>
<%= button_to update_recording_path(@room, record_id: recording[:recordID], state: "unlisted"), class: "dropdown-item" do %> <%= button_to update_recording_path(@room, record_id: recording[:recordID], state: "unlisted"), class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-link"></i> Unlisted <i class="dropdown-icon fas fa-link"></i> Unlisted
<% end %> <% end %>
</div> </div>
</div> </div>
@ -49,7 +49,7 @@
</td> </td>
<td class="text-center"> <td class="text-center">
<div class="item-action dropdown"> <div class="item-action dropdown">
<a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fe fe-more-vertical"></i></a> <a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fas fa-ellipsis-v"></i></a>
<div class="dropdown-menu dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item email-link" data-pres-link="<%= p[:url] %>"><i class="dropdown-icon far fa-envelope"></i> Email Recording</a> <a class="dropdown-item email-link" data-pres-link="<%= p[:url] %>"><i class="dropdown-icon far fa-envelope"></i> Email Recording</a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>

2
app/views/shared/components/_room_block.html.erb
View File

@ -23,7 +23,7 @@
</td> </td>
<td class="text-right"> <td class="text-right">
<div class="item-action dropdown"> <div class="item-action dropdown">
<a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fe fe-more-vertical"></i></a> <a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fas fa-ellipsis-v"></i></a>
<div class="dropdown-menu dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-right">
<%= link_to room, class: "dropdown-item" do %> <%= link_to room, class: "dropdown-item" do %>
<i class="dropdown-icon fas fa-cog"></i> Room Settings <i class="dropdown-icon fas fa-cog"></i> Room Settings

6
app/views/users/edit.html.erb
View File

@ -5,17 +5,17 @@
<div class="col-lg-3 mb-4"> <div class="col-lg-3 mb-4">
<div class="list-group list-group-transparent mb-0"> <div class="list-group list-group-transparent mb-0">
<button id="account" class="list-group-item list-group-item-action setting-btn active"> <button id="account" class="list-group-item list-group-item-action setting-btn active">
<span class="icon mr-3"><i class="fe fe-user"></i></span>Account <span class="icon mr-3"><i class="fas fa-user"></i></span>Account
</button> </button>
<% if @user.social_uid.nil? %> <% if @user.social_uid.nil? %>
<button id="password" class="list-group-item list-group-item-action setting-btn"> <button id="password" class="list-group-item list-group-item-action setting-btn">
<span class="icon mr-3"><i class="fe fe-lock"></i></span>Password <span class="icon mr-3"><i class="fas fa-lock"></i></span>Password
</button> </button>
<% end %> <% end %>
<button id="design" class="list-group-item list-group-item-action setting-btn"> <button id="design" class="list-group-item list-group-item-action setting-btn">
<span class="icon mr-3"><i class="fe fe-edit-2"></i></span>Design <span class="icon mr-3"><i class="fas fa-edit"></i></span>Design
</button> </button>
</div> </div>