diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss index c6d39be541..4800f04de5 100644 --- a/themes/metro/scss/_common.scss +++ b/themes/metro/scss/_common.scss @@ -1,68 +1,3 @@ -// Common styles for the Metro theme - -/* fonts */ - -@font-face { - font-family: 'IcoMoon'; - src: local('☺'); - src: url('../fonts/IcoMoon.eot'); - src: - url('../fonts/IcoMoon.eot?#iefix') format('embedded-opentype'), - url('../fonts/IcoMoon.svg#IcoMoon') format('svg'), - url('../fonts/IcoMoon.woff') format('woff'), - url('../fonts/IcoMoon.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Open Sans'; - src: local('☺'), local('Open Sans'), local('OpenSans'); - src: url('../fonts/opensans-regular-webfont.eot'); - src: - url('../fonts/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/opensans-regular-webfont.woff') format('woff'), - url('../fonts/opensans-regular-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Open Sans Light'; - src: local('☺'), local('Open Sans Light'), local('OpenSans-Light'); - src: url('../fonts/opensans-light-webfont.eot'); - src: - url('../fonts/opensans-light-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/opensans-light-webfont.woff') format('woff'), - url('../fonts/opensans-light-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Open Sans Bold'; - src: local('☺'), local('Open Sans Bold'), local('OpenSans-Bold'); - src: url('../fonts/opensans-bold-webfont.eot'); - src: - url('../fonts/opensans-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/opensans-bold-webfont.woff') format('woff'), - url('../fonts/opensans-bold-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Open Sans Extrabold'; - src: local('☺'), local('Open Sans Extrabold'), local('OpenSans-Extrabold'); - src: url('../fonts/opensans-extrabold-webfont.eot'); - src: - url('../fonts/opensans-extrabold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/opensans-extrabold-webfont.woff') format('woff'), - url('../fonts/opensans-extrabold-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - #li_select_fontsize { display: none; } diff --git a/themes/metro/scss/_font.scss b/themes/metro/scss/_font.scss new file mode 100644 index 0000000000..9a83445454 --- /dev/null +++ b/themes/metro/scss/_font.scss @@ -0,0 +1,60 @@ +@font-face { + font-family: 'IcoMoon'; + src: local('☺'); + src: url('../fonts/IcoMoon.eot'); + src: + url('../fonts/IcoMoon.eot?#iefix') format('embedded-opentype'), + url('../fonts/IcoMoon.svg#IcoMoon') format('svg'), + url('../fonts/IcoMoon.woff') format('woff'), + url('../fonts/IcoMoon.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Open Sans'; + src: local('☺'), local('Open Sans'), local('OpenSans'); + src: url('../fonts/opensans-regular-webfont.eot'); + src: + url('../fonts/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/opensans-regular-webfont.woff') format('woff'), + url('../fonts/opensans-regular-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Open Sans Light'; + src: local('☺'), local('Open Sans Light'), local('OpenSans-Light'); + src: url('../fonts/opensans-light-webfont.eot'); + src: + url('../fonts/opensans-light-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/opensans-light-webfont.woff') format('woff'), + url('../fonts/opensans-light-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Open Sans Bold'; + src: local('☺'), local('Open Sans Bold'), local('OpenSans-Bold'); + src: url('../fonts/opensans-bold-webfont.eot'); + src: + url('../fonts/opensans-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/opensans-bold-webfont.woff') format('woff'), + url('../fonts/opensans-bold-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Open Sans Extrabold'; + src: local('☺'), local('Open Sans Extrabold'), local('OpenSans-Extrabold'); + src: url('../fonts/opensans-extrabold-webfont.eot'); + src: + url('../fonts/opensans-extrabold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/opensans-extrabold-webfont.woff') format('woff'), + url('../fonts/opensans-extrabold-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} diff --git a/themes/metro/scss/theme.scss b/themes/metro/scss/theme.scss index 130678625f..402412e4dc 100644 --- a/themes/metro/scss/theme.scss +++ b/themes/metro/scss/theme.scss @@ -1,3 +1,4 @@ +@import "font"; @import "../../pmahomme/scss/direction"; @import "variables"; @import "../../pmahomme/scss/bootstrap";