Skip to content

Commit

Permalink
Move fonts temporarly to topcoder.scss
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Litwin committed Feb 2, 2016
1 parent 5b847e9 commit 8ce699a
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions styles/topcoder/_tc-typography.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
// --------------------------------------------------------------------------------------------
Expand All @@ -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

0 comments on commit 8ce699a

Please sign in to comment.