forked from External/greenlight
		
	use official font awesome gem
This commit is contained in:
		
							
								
								
									
										2
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Gemfile
									
									
									
									
									
								
							@@ -60,7 +60,7 @@ gem 'bigbluebutton-api-ruby'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
gem 'bootstrap-sass', '3.3.0.0'
 | 
					gem 'bootstrap-sass', '3.3.0.0'
 | 
				
			||||||
gem 'bootstrap-social-rails', '~> 4.12'
 | 
					gem 'bootstrap-social-rails', '~> 4.12'
 | 
				
			||||||
gem 'font-awesome-rails'
 | 
					gem 'font-awesome-sass'
 | 
				
			||||||
gem 'jquery-ui-rails'
 | 
					gem 'jquery-ui-rails'
 | 
				
			||||||
gem 'jquery-datatables-rails', '~> 3.4.0'
 | 
					gem 'jquery-datatables-rails', '~> 3.4.0'
 | 
				
			||||||
gem 'rails-timeago', '~> 2.0'
 | 
					gem 'rails-timeago', '~> 2.0'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,8 +65,8 @@ GEM
 | 
				
			|||||||
    faraday (0.9.2)
 | 
					    faraday (0.9.2)
 | 
				
			||||||
      multipart-post (>= 1.2, < 3)
 | 
					      multipart-post (>= 1.2, < 3)
 | 
				
			||||||
    ffi (1.9.14)
 | 
					    ffi (1.9.14)
 | 
				
			||||||
    font-awesome-rails (4.6.3.1)
 | 
					    font-awesome-sass (4.7.0)
 | 
				
			||||||
      railties (>= 3.2, < 5.1)
 | 
					      sass (>= 3.2)
 | 
				
			||||||
    globalid (0.3.7)
 | 
					    globalid (0.3.7)
 | 
				
			||||||
      activesupport (>= 4.1.0)
 | 
					      activesupport (>= 4.1.0)
 | 
				
			||||||
    hashie (3.4.4)
 | 
					    hashie (3.4.4)
 | 
				
			||||||
@@ -216,7 +216,7 @@ DEPENDENCIES
 | 
				
			|||||||
  byebug
 | 
					  byebug
 | 
				
			||||||
  coffee-rails (~> 4.2)
 | 
					  coffee-rails (~> 4.2)
 | 
				
			||||||
  dotenv-rails
 | 
					  dotenv-rails
 | 
				
			||||||
  font-awesome-rails
 | 
					  font-awesome-sass
 | 
				
			||||||
  http_accept_language
 | 
					  http_accept_language
 | 
				
			||||||
  jbuilder (~> 2.5)
 | 
					  jbuilder (~> 2.5)
 | 
				
			||||||
  jquery-datatables-rails (~> 3.4.0)
 | 
					  jquery-datatables-rails (~> 3.4.0)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,6 +17,8 @@
 | 
				
			|||||||
@import "bootstrap-sprockets";
 | 
					@import "bootstrap-sprockets";
 | 
				
			||||||
@import "bootstrap";
 | 
					@import "bootstrap";
 | 
				
			||||||
@import "bootstrap-social";
 | 
					@import "bootstrap-social";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@import "font-awesome-sprockets";
 | 
				
			||||||
@import "font-awesome";
 | 
					@import "font-awesome";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -77,12 +77,12 @@
 | 
				
			|||||||
    <button type="button" class="btn btn-default has-popover recording-update-trigger"
 | 
					    <button type="button" class="btn btn-default has-popover recording-update-trigger"
 | 
				
			||||||
            data-placement="left" data-popover-body=".recording-visibility-popover"
 | 
					            data-placement="left" data-popover-body=".recording-visibility-popover"
 | 
				
			||||||
            data-popover-title="<%= t('change_recording_visibility') %>">
 | 
					            data-popover-title="<%= t('change_recording_visibility') %>">
 | 
				
			||||||
      <i class="fa fa-eye" aria-hidden="true"></i>
 | 
					      <%= icon('eye') %>
 | 
				
			||||||
    </button>
 | 
					    </button>
 | 
				
			||||||
    <a tabindex="0" role="button" class="btn btn-default has-popover delete-tooltip"
 | 
					    <a tabindex="0" role="button" class="btn btn-default has-popover delete-tooltip"
 | 
				
			||||||
       data-placement="top" data-popover-body=".delete-popover-body"
 | 
					       data-placement="top" data-popover-body=".delete-popover-body"
 | 
				
			||||||
       data-popover-title="<%= t('are_you_sure') %>">
 | 
					       data-popover-title="<%= t('are_you_sure') %>">
 | 
				
			||||||
        <i class="fa fa-trash-o" aria-hidden="true"></i>
 | 
					        <%= icon('trash-o') %>
 | 
				
			||||||
    </a>
 | 
					    </a>
 | 
				
			||||||
  </div>
 | 
					  </div>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,7 +35,7 @@
 | 
				
			|||||||
          data-copy-error="<%= t('copy_error') %>"
 | 
					          data-copy-error="<%= t('copy_error') %>"
 | 
				
			||||||
          data-copy-hint="<%= t('url_copy_explanation') %>"
 | 
					          data-copy-hint="<%= t('url_copy_explanation') %>"
 | 
				
			||||||
        >
 | 
					        >
 | 
				
			||||||
          <i class="fa fa-clipboard" aria-hidden="true"></i>
 | 
					          <%= icon('clipboard') %>
 | 
				
			||||||
        </button>
 | 
					        </button>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <button type="button" class="btn btn-default meeting-invite has-tooltip pull-right"
 | 
					        <button type="button" class="btn btn-default meeting-invite has-tooltip pull-right"
 | 
				
			||||||
@@ -43,7 +43,7 @@
 | 
				
			|||||||
          data-invite-body="<%= body %>"
 | 
					          data-invite-body="<%= body %>"
 | 
				
			||||||
          data-invite-subject="<%= subject %>"
 | 
					          data-invite-subject="<%= subject %>"
 | 
				
			||||||
        >
 | 
					        >
 | 
				
			||||||
          <i class="fa fa-envelope-o" aria-hidden="true"></i>
 | 
					          <%= icon('envelope-o') %>
 | 
				
			||||||
        </button>
 | 
					        </button>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    <% else %>
 | 
					    <% else %>
 | 
				
			||||||
@@ -55,7 +55,7 @@
 | 
				
			|||||||
        data-copy-error="<%= t('copy_error') %>"
 | 
					        data-copy-error="<%= t('copy_error') %>"
 | 
				
			||||||
        data-copy-hint="<%= t('url_copy_explanation') %>"
 | 
					        data-copy-hint="<%= t('url_copy_explanation') %>"
 | 
				
			||||||
        >
 | 
					        >
 | 
				
			||||||
        <i class="fa fa-clipboard" aria-hidden="true"></i>
 | 
					          <%= icon('clipboard') %>
 | 
				
			||||||
      </button>
 | 
					      </button>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <button type="button" class="btn btn-default meeting-invite has-tooltip"
 | 
					      <button type="button" class="btn btn-default meeting-invite has-tooltip"
 | 
				
			||||||
@@ -63,7 +63,7 @@
 | 
				
			|||||||
        data-invite-body="<%= body %>"
 | 
					        data-invite-body="<%= body %>"
 | 
				
			||||||
        data-invite-subject="<%= subject %>"
 | 
					        data-invite-subject="<%= subject %>"
 | 
				
			||||||
      >
 | 
					      >
 | 
				
			||||||
        <i class="fa fa-envelope-o" aria-hidden="true"></i>
 | 
					        <%= icon('envelope-o') %>
 | 
				
			||||||
      </button>
 | 
					      </button>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  </span>
 | 
					  </span>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user