Skip to content

E
edx-platform
Commit b75f900b by Brian Talbot
Options

Merge pull request #8266 from edx/talbs/fix-font-face-calls 

LMS/Studio: Reduce font-face file calls
parents c0eaeb7e 5c8ef9a9
Showing with 218 additions and 90 deletions
cms/static/fonts/OpenSans/OpenSans-Bold-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/fonts/OpenSans/OpenSans-Italic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/fonts/OpenSans/OpenSans-Light-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/fonts/OpenSans/OpenSans-Regular-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
cms/static/sass/assets/_fonts.scss
// studio - assets - fonts
// ====================
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
// No subsetting.
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Light-webfont', 300);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-LightItalic-webfont', 300, italic);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Regular-webfont', 400);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Italic-webfont', 400, italic);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Semibold-webfont', 600);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-SemiboldItalic-webfont', 600, italic);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Bold-webfont', 700);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-BoldItalic-webfont', 700, italic);
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
cms/static/sass/elements/_typography.scss
......@@ -5,7 +5,7 @@
// weights
%t-ultrastrong {
font-weight: 800;
font-weight: 700;
}
%t-strong {
font-weight: 600;
......
common/lib/xmodule/xmodule/css/video/display.scss
......@@ -219,7 +219,7 @@ div.video {
@extend %ui-fake-link;
@include transition(none);
display: block;
font-weight: 800;
font-weight: 700;
line-height: 46px;
margin: 0;
padding: 0 0 0 15px;
......
common/static/css/tinymce-studio-content-fonts.css
......@@ -2,89 +2,81 @@
/* No subsetting. */
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-Light-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-Light-webfont.svg#open_sanslight') format('svg');
font-weight: 300;
font-style: normal;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-LightItalic-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.svg#open_sanslight_italic') format('svg');
font-weight: 300;
font-style: italic;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-Regular-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.svg#open_sansregular') format('svg');
font-weight: 400;
font-style: normal;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-Italic-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.svg#open_sansitalic') format('svg');
font-weight: 400;
font-style: italic;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-Semibold-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.svg#open_sanssemibold') format('svg');
font-weight: 600;
font-style: normal;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.svg#open_sanssemibold_italic') format('svg');
font-weight: 600;
font-style: italic;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-Bold-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.svg#open_sansbold') format('svg');
font-weight: 700;
font-style: normal;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.eot');
src: url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.svg#open_sansbold_italic') format('svg');
font-weight: 700;
font-style: italic;
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
common/static/fonts/OpenSans/OpenSans-Bold-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/fonts/OpenSans/OpenSans-Italic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/fonts/OpenSans/OpenSans-Light-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/fonts/OpenSans/OpenSans-LightItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/fonts/OpenSans/OpenSans-Regular-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/fonts/OpenSans/OpenSans-Semibold-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-Bold-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-Italic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-Light-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-Regular-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-Semibold-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.svg deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/static/sass/base/_font_face.scss
// LMS - assets - fonts
// ====================
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
// No subsetting.
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Light-webfont', 300);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-LightItalic-webfont', 300, italic);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Regular-webfont', 400);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Italic-webfont', 400, italic);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Semibold-webfont', 600);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-SemiboldItalic-webfont', 600, italic);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-Bold-webfont', 700);
@include font-face('Open Sans', '../fonts/OpenSans/OpenSans-BoldItalic-webfont', 700, italic);
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src:
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
lms/static/sass/elements/_typography.scss
......@@ -5,7 +5,7 @@
// weights
%t-ultrastrong {
font-weight: 800;
font-weight: 700;
}
%t-strong {
font-weight: 600;
......
lms/static/sass/multicourse/_course_about.scss
......@@ -61,7 +61,7 @@
a {
color: $lighter-base-font-color;
font: italic 800 0.6em/1em $sans-serif;
font: italic 700 0.6em/1em $sans-serif;
letter-spacing: 0px;
margin-left: ($baseline*0.75);
text-shadow: 0 1px rgba(255,255,255, 0.6);
......@@ -79,7 +79,7 @@
a {
color: $lighter-base-font-color;
font: italic 800 1em/1em $sans-serif;
font: italic 700 1em/1em $sans-serif;
letter-spacing: 0px;
text-shadow: 0 1px rgba(255,255,255, 0.6);
text-transform: none;
......@@ -443,7 +443,7 @@
color: $base-font-color;
font-family: $sans-serif;
font-style: italic;
font-weight: 800;
font-weight: 700;
display: inline-block;
letter-spacing: 0px;
margin-right: ($baseline*0.75);
......
lms/static/sass/multicourse/_courses.scss
......@@ -195,7 +195,7 @@ $facet-background-color: #007db8;
color: $base-font-color;
font-family: $sans-serif;
font-style: italic;
font-weight: 800;
font-weight: 700;
letter-spacing: 0px;
text-transform: none;
}
......
lms/static/sass/multicourse/_home.scss
......@@ -358,7 +358,7 @@ $course-search-input-height: ($button-size);
> span {
color: $base-font-color;
font: 800 italic 1.4em/1.4em $sans-serif;
font: 700 italic 1.4em/1.4em $sans-serif;
text-shadow: 0 1px rgba(255,255,255, 0.6);
@include transition(all 0.15s ease-in-out 0s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment