diff --git a/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.ttf b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.ttf new file mode 100755 index 0000000000..e71279d238 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.woff new file mode 100755 index 0000000000..21288dfc65 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Bold-webfont.woff differ 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.ttf b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf new file mode 100755 index 0000000000..0796612ed7 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff new file mode 100755 index 0000000000..f8a6914002 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff differ 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-Italic-webfont.ttf b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.ttf new file mode 100755 index 0000000000..88a72b3eb9 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.woff new file mode 100755 index 0000000000..0fc3e44536 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Italic-webfont.woff differ 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.ttf b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.ttf new file mode 100755 index 0000000000..d4fb721755 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-Light-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.woff new file mode 100755 index 0000000000..8dd610ceea Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Light-webfont.woff differ 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.ttf b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf new file mode 100755 index 0000000000..913b0f5371 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.woff new file mode 100755 index 0000000000..f0204140da Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-LightItalic-webfont.woff differ 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.ttf b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.ttf new file mode 100755 index 0000000000..1638039b37 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.woff new file mode 100755 index 0000000000..0ad69fb5d4 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Regular-webfont.woff differ 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.ttf b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.ttf new file mode 100755 index 0000000000..0e5dfbe884 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.woff new file mode 100755 index 0000000000..22544e6a96 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-Semibold-webfont.woff differ 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.ttf b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf new file mode 100755 index 0000000000..96240a6e21 Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf differ diff --git a/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff new file mode 100755 index 0000000000..8956812edc Binary files /dev/null and b/cms/static/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff differ 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 d20be5d67e..93ff3a0b4d 100644 --- a/cms/static/sass/assets/_fonts.scss +++ b/cms/static/sass/assets/_fonts.scss @@ -3,9 +3,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype'); font-weight: 300; font-style: normal; } @@ -13,9 +13,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'), + url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype'); font-weight: 300; font-style: italic; } @@ -23,9 +23,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype'); font-weight: 400; font-style: normal; } @@ -33,9 +33,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype'); font-weight: 400; font-style: italic; } @@ -43,9 +43,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype'); font-weight: 600; font-style: normal; } @@ -53,9 +53,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'), + url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'); font-weight: 600; font-style: italic; } @@ -63,9 +63,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'), + url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype'); font-weight: 700; font-style: normal; } @@ -73,9 +73,9 @@ @font-face { font-family: 'Open Sans'; src: - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'), - url('#{$static-path}/edx-pattern-library/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype'); + url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'), + url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'), + url('#{$static-path}/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 3726cd251b..33f8f2acc4 100644 --- a/common/static/css/tinymce-studio-content-fonts.css +++ b/common/static/css/tinymce-studio-content-fonts.css @@ -4,9 +4,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype'); + 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; } @@ -14,9 +14,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype'); + 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; } @@ -24,9 +24,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype'); + 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; } @@ -34,9 +34,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype'); + 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; } @@ -44,9 +44,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype'); + 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; } @@ -54,9 +54,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'); + 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; } @@ -64,9 +64,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype'); + 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; } @@ -74,9 +74,9 @@ @font-face { font-family: 'Open Sans'; src: - url('../edx-pattern-library/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'), - url('../edx-pattern-library/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype'); + 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; }