diff --git a/frontend/resources/styles/collection/font-collection.scss b/frontend/resources/styles/collection/font-collection.scss index bf018b12c..ed1d3701d 100644 --- a/frontend/resources/styles/collection/font-collection.scss +++ b/frontend/resources/styles/collection/font-collection.scss @@ -7,33 +7,33 @@ // 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-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-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); +@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-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-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); +@include font-face-collection("opensans","opensans-black","900"); +@include font-face-collection("opensans","opensans-blackitalic","900",italic); // Bebas @@ -59,30 +59,30 @@ // 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-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-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); +@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-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-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); +@include font-face-collection("robotocondensed","robotocondensed-black","900"); +@include font-face-collection("robotocondensed","robotocondensed-blackitalic","900",italic); diff --git a/frontend/resources/styles/common/dependencies/fonts.scss b/frontend/resources/styles/common/dependencies/fonts.scss index 38d86dc19..63d2ec161 100644 --- a/frontend/resources/styles/common/dependencies/fonts.scss +++ b/frontend/resources/styles/common/dependencies/fonts.scss @@ -41,15 +41,15 @@ $title-lh: 1.25; $title-lh-sm: 1.15; // Font sources -@include font-face("sourcesanspro","sourcesanspro-extralight",100); -@include font-face("sourcesanspro","sourcesanspro-extralightitalic",100,italic); -@include font-face("sourcesanspro","sourcesanspro-light",200); -@include font-face("sourcesanspro","sourcesanspro-lightitalic",200,italic); +@include font-face("sourcesanspro","sourcesanspro-extralight", "100"); +@include font-face("sourcesanspro","sourcesanspro-extralightitalic","100",italic); +@include font-face("sourcesanspro","sourcesanspro-light","200"); +@include font-face("sourcesanspro","sourcesanspro-lightitalic","200",italic); @include font-face("sourcesanspro","sourcesanspro-regular",normal); @include font-face("sourcesanspro","sourcesanspro-italic",normal,italic); -@include font-face("sourcesanspro","sourcesanspro-semibold",500); -@include font-face("sourcesanspro","sourcesanspro-semibolditalic",500,italic); +@include font-face("sourcesanspro","sourcesanspro-semibold","500"); +@include font-face("sourcesanspro","sourcesanspro-semibolditalic","500",italic); @include font-face("sourcesanspro","sourcesanspro-bold",bold); @include font-face("sourcesanspro","sourcesanspro-bolditalic",bold,italic); -@include font-face("sourcesanspro","sourcesanspro-black",900); -@include font-face("sourcesanspro","sourcesanspro-blackitalic",900,italic); +@include font-face("sourcesanspro","sourcesanspro-black","900"); +@include font-face("sourcesanspro","sourcesanspro-blackitalic","900",italic); diff --git a/frontend/resources/styles/common/dependencies/helpers.scss b/frontend/resources/styles/common/dependencies/helpers.scss index d5f900178..4f4816059 100644 --- a/frontend/resources/styles/common/dependencies/helpers.scss +++ b/frontend/resources/styles/common/dependencies/helpers.scss @@ -40,10 +40,6 @@ $br-big: 8px; } } -&.half { - width: 50%; -} - .column-half { margin-right: $small; }