Fix glyphicons, suse-icon and remove unused fonts

This commit is contained in:
Henne Vogelsang 2014-11-27 14:47:00 +01:00
parent ce6ed0a8e9
commit 60bb00b88e
19 changed files with 7 additions and 2 deletions

View file

@ -46,6 +46,7 @@ gem 'uglifier', '>= 1.3.0'
# as the front-end framework # as the front-end framework
gem 'bootstrap-sass' gem 'bootstrap-sass'
gem 'autoprefixer-rails'
gem 'formtastic-bootstrap' gem 'formtastic-bootstrap'
gem 'formtastic', '~> 2.3.0.rc3' gem 'formtastic', '~> 2.3.0.rc3'
gem 'momentjs-rails', '>= 2.8.1' gem 'momentjs-rails', '>= 2.8.1'

View file

@ -56,6 +56,8 @@ GEM
uuidtools uuidtools
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
ast (2.0.0) ast (2.0.0)
autoprefixer-rails (4.0.1)
execjs
awesome_nested_set (3.0.0.rc.5) awesome_nested_set (3.0.0.rc.5)
activerecord (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5)
axlsx (2.0.1) axlsx (2.0.1)
@ -432,6 +434,7 @@ DEPENDENCIES
acts_as_commentable_with_threading acts_as_commentable_with_threading
acts_as_list acts_as_list
ahoy_matey ahoy_matey
autoprefixer-rails
awesome_nested_set (~> 3.0.0.rc.5) awesome_nested_set (~> 3.0.0.rc.5)
axlsx_rails axlsx_rails
bootstrap-sass bootstrap-sass

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before After
Before After

View file

@ -7,9 +7,9 @@
*= require osem-schedule *= require osem-schedule
*= require osem-schedule-print *= require osem-schedule-print
*= require osem-dashboard *= require osem-dashboard
*= require osem-fonts
*= require osem-splash *= require osem-splash
*= require font-awesome *= require font-awesome
*= require osem-fonts
*= require bootstrap-markdown.min *= require bootstrap-markdown.min
*= require bootstrap-datetimepicker *= require bootstrap-datetimepicker
*= require leaflet *= require leaflet

View file

@ -6,6 +6,7 @@ $navbar-default-link-color: #ffffff;
$navbar-default-link-hover-color: #000000; $navbar-default-link-hover-color: #000000;
@import 'bootstrap-datetimepicker'; @import 'bootstrap-datetimepicker';
@import "bootstrap-sprockets";
// //
// Bootstrap components // Bootstrap components
@ -59,4 +60,4 @@ $navbar-default-link-hover-color: #000000;
// Utility classes // Utility classes
@import "bootstrap/utilities"; @import "bootstrap/utilities";
@import "bootstrap/responsive-utilities"; @import "bootstrap/responsive-utilities";