Fix glyphicons, suse-icon and remove unused fonts
This commit is contained in:
parent
ce6ed0a8e9
commit
60bb00b88e
19 changed files with 7 additions and 2 deletions
1
Gemfile
1
Gemfile
|
|
@ -46,6 +46,7 @@ gem 'uglifier', '>= 1.3.0'
|
|||
|
||||
# as the front-end framework
|
||||
gem 'bootstrap-sass'
|
||||
gem 'autoprefixer-rails'
|
||||
gem 'formtastic-bootstrap'
|
||||
gem 'formtastic', '~> 2.3.0.rc3'
|
||||
gem 'momentjs-rails', '>= 2.8.1'
|
||||
|
|
|
|||
|
|
@ -56,6 +56,8 @@ GEM
|
|||
uuidtools
|
||||
arel (5.0.1.20140414130214)
|
||||
ast (2.0.0)
|
||||
autoprefixer-rails (4.0.1)
|
||||
execjs
|
||||
awesome_nested_set (3.0.0.rc.5)
|
||||
activerecord (>= 4.0.0, < 5)
|
||||
axlsx (2.0.1)
|
||||
|
|
@ -432,6 +434,7 @@ DEPENDENCIES
|
|||
acts_as_commentable_with_threading
|
||||
acts_as_list
|
||||
ahoy_matey
|
||||
autoprefixer-rails
|
||||
awesome_nested_set (~> 3.0.0.rc.5)
|
||||
axlsx_rails
|
||||
bootstrap-sass
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
|
@ -7,9 +7,9 @@
|
|||
*= require osem-schedule
|
||||
*= require osem-schedule-print
|
||||
*= require osem-dashboard
|
||||
*= require osem-fonts
|
||||
*= require osem-splash
|
||||
*= require font-awesome
|
||||
*= require osem-fonts
|
||||
*= require bootstrap-markdown.min
|
||||
*= require bootstrap-datetimepicker
|
||||
*= require leaflet
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -6,6 +6,7 @@ $navbar-default-link-color: #ffffff;
|
|||
$navbar-default-link-hover-color: #000000;
|
||||
|
||||
@import 'bootstrap-datetimepicker';
|
||||
@import "bootstrap-sprockets";
|
||||
|
||||
//
|
||||
// Bootstrap components
|
||||
|
|
@ -59,4 +60,4 @@ $navbar-default-link-hover-color: #000000;
|
|||
|
||||
// Utility classes
|
||||
@import "bootstrap/utilities";
|
||||
@import "bootstrap/responsive-utilities";
|
||||
@import "bootstrap/responsive-utilities";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue