From 9454df17a039c0d8bdc0dcfcfa335cf4549c8a9a Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 29 Sep 2017 13:32:56 +0630 Subject: [PATCH] updating --- app/assets/stylesheets/application.scss | 18 ++++++++++++++++++ app/views/layouts/application.html.erb | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ab90685b..36aeee3a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,3 +1,21 @@ +@font-face { + font-family: 'Roboto'; + src: url('../plugins/materialize-css/fonts/Roboto-Regular.woff'); + font-weight: 400; +} + +@font-face { + font-family: 'Material Icons'; + src: url('../plugins/material-design-iconic-font/fonts//MaterialIcons-Regular.eot'); /* For IE6-8 */ + src: local('Material Icons'), + local('MaterialIcons-Regular'), + url('../plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2?v=2.2.0') format('woff2'), + url('../plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff?v=2.2.0') format('woff'), + url('../plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf?v=2.2.0') format('truetype'); + font-weight: 400; + font-style: normal; +} + @import "tether"; @import "bootstrap/css/bootstrap-material-design.min"; @import "node-waves/waves"; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 91397c0f..2c0332c7 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,8 +11,8 @@ - - +