Fix glyphicons, suse-icon and remove unused fonts

2014-11-27 14:47:00 +01:00 · 2014-11-27 14:47:00 +01:00 · 60bb00b88e
commit 60bb00b88e
parent ce6ed0a8e9
19 changed files with 7 additions and 2 deletions
--- a/app/assets/stylesheets/fonts/suse-icons.eot
+++ b/app/assets/stylesheets/fonts/suse-icons.eot
--- a/app/assets/stylesheets/fonts/suse-icons.svg
+++ b/app/assets/stylesheets/fonts/suse-icons.svg
--- a/app/assets/stylesheets/fonts/suse-icons.ttf
+++ b/app/assets/stylesheets/fonts/suse-icons.ttf
--- a/app/assets/stylesheets/fonts/suse-icons.woff
+++ b/app/assets/stylesheets/fonts/suse-icons.woff
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@ -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
--- a/app/assets/stylesheets/fonts/Coustard-Black.woff
+++ b/app/assets/stylesheets/fonts/Coustard-Black.woff
--- a/app/assets/stylesheets/fonts/Coustard.woff
+++ b/app/assets/stylesheets/fonts/Coustard.woff
--- a/app/assets/stylesheets/fonts/Lato-Bold.woff
+++ b/app/assets/stylesheets/fonts/Lato-Bold.woff
--- a/app/assets/stylesheets/fonts/Lato-Italic.woff
+++ b/app/assets/stylesheets/fonts/Lato-Italic.woff
--- a/app/assets/stylesheets/fonts/Lato-Light.woff
+++ b/app/assets/stylesheets/fonts/Lato-Light.woff
--- a/app/assets/stylesheets/fonts/Lato-LightItalic.woff
+++ b/app/assets/stylesheets/fonts/Lato-LightItalic.woff
--- a/app/assets/stylesheets/fonts/Lato-Regular.woff
+++ b/app/assets/stylesheets/fonts/Lato-Regular.woff
--- a/app/assets/stylesheets/fonts/Raleway-Bold.woff
+++ b/app/assets/stylesheets/fonts/Raleway-Bold.woff
--- a/app/assets/stylesheets/fonts/Raleway-Light.woff
+++ b/app/assets/stylesheets/fonts/Raleway-Light.woff
--- a/app/assets/stylesheets/fonts/Raleway.woff
+++ b/app/assets/stylesheets/fonts/Raleway.woff
--- a/app/assets/stylesheets/osem-fonts.css.scss
+++ b/app/assets/stylesheets/osem-fonts.css.scss
--- a/app/assets/stylesheets/strap-on.css.scss
+++ b/app/assets/stylesheets/strap-on.css.scss
@ -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";