From 8ce699a0bf12f927b4db04e34949c7bf1db26dbd Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Tue, 2 Feb 2016 11:59:51 -0800 Subject: [PATCH] Move fonts temporarly to topcoder.scss --- styles/topcoder/_tc-typography.scss | 58 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/styles/topcoder/_tc-typography.scss b/styles/topcoder/_tc-typography.scss index 4f354ca..6059020 100644 --- a/styles/topcoder/_tc-typography.scss +++ b/styles/topcoder/_tc-typography.scss @@ -7,19 +7,19 @@ // -------------------------------------------------------------------------------------------- // Use the mixin to include fonts. -@mixin font-family($font-name, $font-weight, $font-style, $font-url, $font-file) { - @font-face { - font-family: '#{$font-name}'; - src: url('#{$font-url}#{$font-file}-webfont.eot'); - src: url('#{$font-url}#{$font-file}-webfont.eot?#iefix') format('embedded-opentype'), - url('#{$font-url}#{$font-file}-webfont.woff2') format('woff2'), - url('#{$font-url}#{$font-file}-webfont.woff') format('woff'), - url('#{$font-url}#{$font-file}-webfont.ttf') format('truetype'), - url('#{$font-url}-webfont.svg##{$font-file}') format('svg'); - font-weight: $font-weight; - font-style: $font-style; - } -} +// @mixin font-family($font-name, $font-weight, $font-style, $font-url, $font-file) { +// @font-face { +// font-family: '#{$font-name}'; +// src: url('#{$font-url}#{$font-file}-webfont.eot'); +// src: url('#{$font-url}#{$font-file}-webfont.eot?#iefix') format('embedded-opentype'), +// url('#{$font-url}#{$font-file}-webfont.woff2') format('woff2'), +// url('#{$font-url}#{$font-file}-webfont.woff') format('woff'), +// url('#{$font-url}#{$font-file}-webfont.ttf') format('truetype'), +// url('#{$font-url}-webfont.svg##{$font-file}') format('svg'); +// font-weight: $font-weight; +// font-style: $font-style; +// } +// } // FONT WEIGHTS // -------------------------------------------------------------------------------------------- @@ -36,21 +36,21 @@ // 900 Black (Heavy) // Sofia Pro -@include font-family('Sofia Pro', 700, normal, '/assets/fonts/sofiapro/', 'sofiapro-bold'); // Bold -@include font-family('Sofia Pro', 700, italic, '/assets/fonts/sofiapro/', 'sofiapro-bold-italic'); // Bold Italic -@include font-family('Sofia Pro', 600, normal, '/assets/fonts/sofiapro/', 'sofiapro-semibold'); // Semibold -@include font-family('Sofia Pro', 600, italic, '/assets/fonts/sofiapro/', 'sofiapro-semibold-italic'); // Semibold Italic -@include font-family('Sofia Pro', 500, normal, '/assets/fonts/sofiapro/', 'sofiapro-medium'); // Medium -@include font-family('Sofia Pro', 500, italic, '/assets/fonts/sofiapro/', 'sofiapro-medium-italic'); // Medium Italic -@include font-family('Sofia Pro', 400, normal, '/assets/fonts/sofiapro/', 'sofiapro-regular'); // Regular -@include font-family('Sofia Pro', 400, italic, '/assets/fonts/sofiapro/', 'sofiapro-regular-italic'); // Italic -@include font-family('Sofia Pro', 300, normal, '/assets/fonts/sofiapro/', 'sofiapro-light'); // Light -@include font-family('Sofia Pro', 300, italic, '/assets/fonts/sofiapro/', 'sofiapro-light-italic'); // Light Italic +// @include font-family('Sofia Pro', 700, normal, '/assets/fonts/sofiapro/', 'sofiapro-bold'); // Bold +// @include font-family('Sofia Pro', 700, italic, '/assets/fonts/sofiapro/', 'sofiapro-bold-italic'); // Bold Italic +// @include font-family('Sofia Pro', 600, normal, '/assets/fonts/sofiapro/', 'sofiapro-semibold'); // Semibold +// @include font-family('Sofia Pro', 600, italic, '/assets/fonts/sofiapro/', 'sofiapro-semibold-italic'); // Semibold Italic +// @include font-family('Sofia Pro', 500, normal, '/assets/fonts/sofiapro/', 'sofiapro-medium'); // Medium +// @include font-family('Sofia Pro', 500, italic, '/assets/fonts/sofiapro/', 'sofiapro-medium-italic'); // Medium Italic +// @include font-family('Sofia Pro', 400, normal, '/assets/fonts/sofiapro/', 'sofiapro-regular'); // Regular +// @include font-family('Sofia Pro', 400, italic, '/assets/fonts/sofiapro/', 'sofiapro-regular-italic'); // Italic +// @include font-family('Sofia Pro', 300, normal, '/assets/fonts/sofiapro/', 'sofiapro-light'); // Light +// @include font-family('Sofia Pro', 300, italic, '/assets/fonts/sofiapro/', 'sofiapro-light-italic'); // Light Italic // Merriweather Sans -@include font-family('Merriweather Sans', 700, normal, '/assets/fonts/merriweather-sans/', 'merriweathersans-bold'); // Bold -@include font-family('Merriweather Sans', 700, italic, '/assets/fonts/merriweather-sans/', 'merriweathersans-bolditalic'); // Bold Italic -@include font-family('Merriweather Sans', 400, normal, '/assets/fonts/merriweather-sans/', 'merriweathersans-regular'); // Regular -@include font-family('Merriweather Sans', 400, italic, '/assets/fonts/merriweather-sans/', 'merriweathersans-italic'); // Italic -@include font-family('Merriweather Sans', 300, normal, '/assets/fonts/merriweather-sans/', 'merriweathersans-light'); // Light -@include font-family('Merriweather Sans', 300, italic, '/assets/fonts/merriweather-sans/', 'merriweathersans-lightitalic'); // Light Italic +// @include font-family('Merriweather Sans', 700, normal, '/assets/fonts/merriweather-sans/', 'merriweathersans-bold'); // Bold +// @include font-family('Merriweather Sans', 700, italic, '/assets/fonts/merriweather-sans/', 'merriweathersans-bolditalic'); // Bold Italic +// @include font-family('Merriweather Sans', 400, normal, '/assets/fonts/merriweather-sans/', 'merriweathersans-regular'); // Regular +// @include font-family('Merriweather Sans', 400, italic, '/assets/fonts/merriweather-sans/', 'merriweathersans-italic'); // Italic +// @include font-family('Merriweather Sans', 300, normal, '/assets/fonts/merriweather-sans/', 'merriweathersans-light'); // Light +// @include font-family('Merriweather Sans', 300, italic, '/assets/fonts/merriweather-sans/', 'merriweathersans-lightitalic'); // Light Italic