From: Tim Düsterhus Date: Fri, 6 Aug 2021 11:34:59 +0000 (+0200) Subject: Revert "Update Open Sans" X-Git-Tag: 5.4.3~16 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9b8952f95dae804f4c5fd53bf435b2da4a6f785b;p=GitHub%2FWoltLab%2FWCF.git Revert "Update Open Sans" This reverts Open Sans back to the non-variable version, as the variable one appears to render pretty badly on Windows. This reverts commit 33c8866a790e9e6bc46358f6e82df76d2e32f56e. --- diff --git a/wcfsetup/install/files/font/families/Open Sans/LICENSE.txt b/wcfsetup/install/files/font/families/Open Sans/LICENSE.txt index 1b44aefcba..75b52484ea 100644 --- a/wcfsetup/install/files/font/families/Open Sans/LICENSE.txt +++ b/wcfsetup/install/files/font/families/Open Sans/LICENSE.txt @@ -200,4 +200,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-Bold.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Bold.woff2 new file mode 100644 index 0000000000..dcc95a64a4 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Bold.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-BoldItalic.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-BoldItalic.woff2 new file mode 100644 index 0000000000..3830441343 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-BoldItalic.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-ExtraBold.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-ExtraBold.woff2 new file mode 100644 index 0000000000..c35f87b3e1 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-ExtraBold.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-ExtraBoldItalic.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-ExtraBoldItalic.woff2 new file mode 100644 index 0000000000..181f8a714c Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-ExtraBoldItalic.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-Italic.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Italic.woff2 new file mode 100644 index 0000000000..cff0ff1ed4 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Italic.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-Italic[wdth,wght].woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Italic[wdth,wght].woff2 deleted file mode 100644 index ee603e7fd1..0000000000 Binary files a/wcfsetup/install/files/font/families/Open Sans/OpenSans-Italic[wdth,wght].woff2 and /dev/null differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-Light.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Light.woff2 new file mode 100644 index 0000000000..979ec09796 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Light.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-LightItalic.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-LightItalic.woff2 new file mode 100644 index 0000000000..e32e49f2f4 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-LightItalic.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-Regular.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Regular.woff2 new file mode 100644 index 0000000000..603d8b29f6 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-Regular.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-SemiBold.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-SemiBold.woff2 new file mode 100644 index 0000000000..3c2aac20d9 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-SemiBold.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans-SemiBoldItalic.woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans-SemiBoldItalic.woff2 new file mode 100644 index 0000000000..0a8919b295 Binary files /dev/null and b/wcfsetup/install/files/font/families/Open Sans/OpenSans-SemiBoldItalic.woff2 differ diff --git a/wcfsetup/install/files/font/families/Open Sans/OpenSans[wdth,wght].woff2 b/wcfsetup/install/files/font/families/Open Sans/OpenSans[wdth,wght].woff2 deleted file mode 100644 index 3053b82f36..0000000000 Binary files a/wcfsetup/install/files/font/families/Open Sans/OpenSans[wdth,wght].woff2 and /dev/null differ diff --git a/wcfsetup/install/files/font/families/Open Sans/font.css b/wcfsetup/install/files/font/families/Open Sans/font.css index 4d7cb2de32..1d023b7f7f 100644 --- a/wcfsetup/install/files/font/families/Open Sans/font.css +++ b/wcfsetup/install/files/font/families/Open Sans/font.css @@ -4,27 +4,87 @@ */ @font-face { - /* Copyright: Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) */ + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url(getFont("OpenSans-Light.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSans-LightItalic'), url(getFont("OpenSans-LightItalic.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ font-family: 'Open Sans'; font-style: normal; font-weight: 400; - font-weight: 300 800; - font-stretch: 75 100; - src: local('Open Sans Regular'), local('OpenSans-Regular'), url(getFont("OpenSans%5Bwdth%2Cwght%5D.woff2", "Open%20Sans", "1614344077")) format('woff2 supports variations'), url(getFont("OpenSans%5Bwdth%2Cwght%5D.woff2", "Open%20Sans", "1614344077")) format('woff2-variations'), url(getFont("OpenSans%5Bwdth%2Cwght%5D.woff2", "Open%20Sans", "1614344077")) format('woff2'); + src: local('Open Sans Regular'), local('OpenSans-Regular'), url(getFont("OpenSans-Regular.woff2", "Open%20Sans", "1614334343")) format('woff2'); } @font-face { - /* Copyright: Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) */ + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ font-family: 'Open Sans'; font-style: italic; font-weight: 400; - font-weight: 300 800; - font-stretch: 75 100; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(getFont("OpenSans-Italic%5Bwdth%2Cwght%5D.woff2", "Open%20Sans", "1614344077")) format('woff2 supports variations'), url(getFont("OpenSans-Italic%5Bwdth%2Cwght%5D.woff2", "Open%20Sans", "1614344077")) format('woff2-variations'), url(getFont("OpenSans-Italic%5Bwdth%2Cwght%5D.woff2", "Open%20Sans", "1614344077")) format('woff2'); + src: local('Open Sans Italic'), local('OpenSans-Italic'), url(getFont("OpenSans-Italic.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(getFont("OpenSans-SemiBold.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'), url(getFont("OpenSans-SemiBoldItalic.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(getFont("OpenSans-Bold.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url(getFont("OpenSans-BoldItalic.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: normal; + font-weight: 800; + src: local('Open Sans ExtraBold'), local('OpenSans-ExtraBold'), url(getFont("OpenSans-ExtraBold.woff2", "Open%20Sans", "1614334343")) format('woff2'); +} + +@font-face { + /* Copyright: Digitized data copyright 2010-2011, Google Corporation. */ + font-family: 'Open Sans'; + font-style: italic; + font-weight: 800; + src: local('Open Sans ExtraBold Italic'), local('OpenSans-ExtraBoldItalic'), url(getFont("OpenSans-ExtraBoldItalic.woff2", "Open%20Sans", "1614334343")) format('woff2'); } woltlab-suite-preload:root { --woltlab-suite-preload: #{preload( - getFont("OpenSans%5Bwdth%2Cwght%5D.woff2", "Open%20Sans", "1614344077"), + getFont("OpenSans-Regular.woff2", "Open%20Sans", "1614334343"), $as: "font", $crossorigin: true )}; } \ No newline at end of file