From fa0009c5edebb1f2410d5b39de81f84813aaecd7 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 16 Sep 2015 08:05:21 +0200 Subject: [PATCH] move material-design font-face to custom.scss --- app/themes/material-design/custom.scss | 14 ++++++++++++++ app/themes/material-design/variables.scss | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/themes/material-design/custom.scss b/app/themes/material-design/custom.scss index 173605d4..667b7ba6 100644 --- a/app/themes/material-design/custom.scss +++ b/app/themes/material-design/custom.scss @@ -4,6 +4,20 @@ // Fezzik: I'm on the Brute Squad. // Max: [sees Fezzik's size] You are the Brute Squad! +//************************** +//** TYPOGRAPHY +//************************** + +@each $font-face in OpenSans-CondLight, OpenSans-Light, opensans-regular, opensans-semibold, taiga { + @font-face { + font-family: '#{$font-face}'; + src: url('../fonts/#{$font-face}.eot?#iefix') format('embedded-opentype'), + url('../fonts/#{$font-face}.woff') format('woff'), + url('../fonts/#{$font-face}.ttf') format('truetype'), + url('../fonts/#{$font-face}.svg#{$font-face}') format('svg'); + } +} + //************************* //** LAYOUT //************************* diff --git a/app/themes/material-design/variables.scss b/app/themes/material-design/variables.scss index 0ee30c4f..57ce0eb9 100755 --- a/app/themes/material-design/variables.scss +++ b/app/themes/material-design/variables.scss @@ -34,20 +34,6 @@ $yellow-pear: #ffc107; $top-icon-color: $white; $dropdown-color: rgba(darken($primary-dark, 20%), 1); -//************************** -//** TYPOGRAPHY -//************************** - -@each $font-face in OpenSans-CondLight, OpenSans-Light, opensans-regular, opensans-semibold, taiga { - @font-face { - font-family: '#{$font-face}'; - src: url('../fonts/#{$font-face}.eot?#iefix') format('embedded-opentype'), - url('../fonts/#{$font-face}.woff') format('woff'), - url('../fonts/#{$font-face}.ttf') format('truetype'), - url('../fonts/#{$font-face}.svg#{$font-face}') format('svg'); - } -} - // Font Sizes %xsmall {font-size: .75rem;} %small {font-size: .9rem;}