From 62588620a66c54a2a6b6c9a5be8d5e41abb6db3d Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Tue, 1 Mar 2016 19:22:22 +0100 Subject: [PATCH] add font collection structure --- .../styles/collection/font-collection.scss | 81 +++++++++++++++++++ resources/styles/dependencies/mixin.scss | 12 +++ resources/styles/main.scss | 6 ++ 3 files changed, 99 insertions(+) create mode 100644 resources/styles/collection/font-collection.scss diff --git a/resources/styles/collection/font-collection.scss b/resources/styles/collection/font-collection.scss new file mode 100644 index 000000000..dd2ee5357 --- /dev/null +++ b/resources/styles/collection/font-collection.scss @@ -0,0 +1,81 @@ +// source sans pro + +@include font-face-collection("sourcesanspro","sourcesanspro-extralight",100); +@include font-face-collection("sourcesanspro","sourcesanspro-extralightitalic",100,italic); +@include font-face-collection("sourcesanspro","sourcesanspro-light",200); +@include font-face-collection("sourcesanspro","sourcesanspro-lightitalic",200,italic); +@include font-face-collection("sourcesanspro","sourcesanspro-regular",normal); +@include font-face-collection("sourcesanspro","sourcesanspro-italic",normal,italic); +@include font-face-collection("sourcesanspro","sourcesanspro-semibold",500); +@include font-face-collection("sourcesanspro","sourcesanspro-semibolditalic",500,italic); +@include font-face-collection("sourcesanspro","sourcesanspro-bold",bold); +@include font-face-collection("sourcesanspro","sourcesanspro-bolditalic",bold,italic); +@include font-face-collection("sourcesanspro","sourcesanspro-black",900); +@include font-face-collection("sourcesanspro","sourcesanspro-blackitalic",900,italic); + +// Open Sans + +@include font-face-collection("opensans","opensans-extralight",100); +@include font-face-collection("opensans","opensans-extralightitalic",100,italic); +@include font-face-collection("opensans","opensans-light",200); +@include font-face-collection("opensans","opensans-lightitalic",200,italic); +@include font-face-collection("opensans","opensans-regular",normal); +@include font-face-collection("opensans","opensans-italic",normal,italic); +@include font-face-collection("opensans","opensans-semibold",500); +@include font-face-collection("opensans","opensans-semibolditalic",500,italic); +@include font-face-collection("opensans","opensans-bold",bold); +@include font-face-collection("opensans","opensans-bolditalic",bold,italic); +@include font-face-collection("opensans","opensans-black",900); +@include font-face-collection("opensans","opensans-blackitalic",900,italic); + +// Bebas + +@include font-face-collection("bebas","bebas",normal); + +// Caviar Dreams + +@include font-face-collection("caviardreams","caviardreams",normal); +@include font-face-collection("caviardreams","caviardreams-italic",normal,italic); +@include font-face-collection("caviardreams","caviardreams-bold",bold); +@include font-face-collection("caviardreams","caviardreams-bolditalic",bold,italic); + +// Good Dog + +@include font-face-collection("gooddog","gooddog",normal); + +// PT Sans + +@include font-face-collection("ptsans","ptsans",normal); +@include font-face-collection("ptsans","ptsans-italic",normal,italic); +@include font-face-collection("ptsans","ptsans-bold",bold); +@include font-face-collection("ptsans","ptsans-bolditalic",bold,italic); + +// Roboto + +@include font-face-collection("roboto","roboto-thin",100); +@include font-face-collection("roboto","roboto-thinitalic",100,italic); +@include font-face-collection("roboto","roboto-light",200); +@include font-face-collection("roboto","roboto-lightitalic",200,italic); +@include font-face-collection("roboto","roboto-regular",normal); +@include font-face-collection("roboto","roboto-italic",normal,italic); +@include font-face-collection("roboto","roboto-semibold",500); +@include font-face-collection("roboto","roboto-semibolditalic",500,italic); +@include font-face-collection("roboto","roboto-bold",bold); +@include font-face-collection("roboto","roboto-bolditalic",bold,italic); +@include font-face-collection("roboto","roboto-black",900); +@include font-face-collection("roboto","roboto-blackitalic",900,italic); + +// Roboto Condensed + +@include font-face-collection("robotocondensed","robotocondensed-thin",100); +@include font-face-collection("robotocondensed","robotocondensed-thinitalic",100,italic); +@include font-face-collection("robotocondensed","robotocondensed-light",200); +@include font-face-collection("robotocondensed","robotocondensed-lightitalic",200,italic); +@include font-face-collection("robotocondensed","robotocondensed-regular",normal); +@include font-face-collection("robotocondensed","robotocondensed-italic",normal,italic); +@include font-face-collection("robotocondensed","robotocondensed-semibold",500); +@include font-face-collection("robotocondensed","robotocondensed-semibolditalic",500,italic); +@include font-face-collection("robotocondensed","robotocondensed-bold",bold); +@include font-face-collection("robotocondensed","robotocondensed-bolditalic",bold,italic); +@include font-face-collection("robotocondensed","robotocondensed-black",900); +@include font-face-collection("robotocondensed","robotocondensed-blackitalic",900,italic); diff --git a/resources/styles/dependencies/mixin.scss b/resources/styles/dependencies/mixin.scss index b3e4da937..4e75520c2 100644 --- a/resources/styles/dependencies/mixin.scss +++ b/resources/styles/dependencies/mixin.scss @@ -105,6 +105,18 @@ } } +// Collection fonts + +@mixin font-face-collection($style-name, $file, $weight: unquote("normal"), $style: unquote("normal") ) { + $filepath: "/fonts/collection/" + $file; + @font-face { + font-family: "#{$style-name}"; + src: url($filepath + ".eot"); + src: url($filepath + ".eot?#iefix") format('embedded-opentype'), url($filepath + ".woff") format('woff'), url($filepath + ".ttf") format('truetype'), url($filepath + ".svg#" + $style-name + "") format('svg'); + font-weight: unquote($weight); + font-style: unquote($style); + } +} @mixin tooltipShow { &:hover { diff --git a/resources/styles/main.scss b/resources/styles/main.scss index 4b6e8d7ff..63aec9a59 100644 --- a/resources/styles/main.scss +++ b/resources/styles/main.scss @@ -50,3 +50,9 @@ @import 'partials/color-palette'; @import 'partials/colorpicker'; @import 'partials/forms'; + +//################################################# +// Resources +//################################################# + +@import 'collection/font-collection';