diff --git a/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.eot
deleted file mode 100755
index 5b6e0e6f19..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.svg
deleted file mode 100755
index ff239cf156..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.woff2
new file mode 100755
index 0000000000..c80b2d2afb
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.eot
deleted file mode 100755
index b5e5e7cc3a..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg
deleted file mode 100755
index f3c1273878..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2
new file mode 100755
index 0000000000..60d8de4f64
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-ExtraBold-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-ExtraBold-webfont.woff
new file mode 100755
index 0000000000..223715a5fb
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-ExtraBold-webfont.woff differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-ExtraBold-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-ExtraBold-webfont.woff2
new file mode 100755
index 0000000000..bbaa1d4ea6
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-ExtraBold-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-ExtraBoldItalic-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-ExtraBoldItalic-webfont.woff
new file mode 100755
index 0000000000..ddd0573dd2
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-ExtraBoldItalic-webfont.woff differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-ExtraBoldItalic-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-ExtraBoldItalic-webfont.woff2
new file mode 100755
index 0000000000..eff8367bc9
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-ExtraBoldItalic-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.eot
deleted file mode 100755
index 54fd29dc25..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.svg
deleted file mode 100755
index ab4bb7e1bb..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.woff2
new file mode 100755
index 0000000000..440b74c391
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Light-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.eot
deleted file mode 100755
index ea950e622f..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-Light-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Light-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.svg
deleted file mode 100755
index a36a5b7ee7..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-Light-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-Light-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.woff2
new file mode 100755
index 0000000000..d0b43e0adf
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.eot
deleted file mode 100755
index fdacf6e4e1..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.svg
deleted file mode 100755
index 8cf6f52132..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2
new file mode 100755
index 0000000000..21a92a7e8d
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.eot
deleted file mode 100755
index 3953513ecd..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.svg
deleted file mode 100755
index a169e01ae8..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.woff2
new file mode 100755
index 0000000000..f778f9c845
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.eot
deleted file mode 100755
index cfc3dd7b42..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.svg
deleted file mode 100755
index 2704ab4431..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.woff2
new file mode 100755
index 0000000000..852f7106ce
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.woff2 differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.eot b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.eot
deleted file mode 100755
index 635848ce52..0000000000
Binary files a/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.svg b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.svg
deleted file mode 100755
index 66a1abd0e8..0000000000
--- a/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.svg
+++ /dev/null
@@ -1,1824 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2 b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2
new file mode 100755
index 0000000000..b0c2a26b40
Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2 differ
diff --git a/cms/static/sass/assets/_fonts.scss b/cms/static/sass/assets/_fonts.scss
index 72cbf75105..65c1c91f3e 100644
--- a/cms/static/sass/assets/_fonts.scss
+++ b/cms/static/sass/assets/_fonts.scss
@@ -1,13 +1,81 @@
// 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;
+}
diff --git a/common/static/css/tinymce-studio-content-fonts.css b/common/static/css/tinymce-studio-content-fonts.css
index e21ec0d35a..33f8f2acc4 100644
--- a/common/static/css/tinymce-studio-content-fonts.css
+++ b/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;
}