diff -r 0e6703cd0968 -r ac1a026edd58 client/src/index.scss --- a/client/src/index.scss Fri Nov 16 11:19:13 2018 +0100 +++ b/client/src/index.scss Fri Nov 16 17:01:19 2018 +0100 @@ -1,22 +1,2 @@ +@import './scss/fonts'; @import './scss/custom'; -@import './scss/material-font'; - - -@font-face { - font-family: 'Rubik'; - font-style: normal; - font-weight: 400; - src: url('assets/rubik-v7-latin-regular.eot'); /* IE9 Compat Modes */ - src: local('Rubik'), local('Rubik-Regular'), - url('assets/rubik-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('assets/rubik-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('assets/rubik-v7-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('assets/rubik-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('assets/rubik-v7-latin-regular.svg#Rubik') format('svg'); /* Legacy iOS */ - } - -body { - margin: 0; - // padding-top: $navbar-height + $navbar-margin-bottom; - font-family: 'Rubik', sans-serif; -}