Skip to content

Commit

Permalink
fix: remove woff files and woff/ttf usage (#5629)
Browse files Browse the repository at this point in the history 
Because IE11 is not supported anymore, woff files can be removed.

In OpenUI5 this was achieved with SAP/openui5@e843fb8
  • Loading branch information
@flovogt
flovogt authored Aug 4, 2022
1 parent d41853e commit e4175cd
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 42 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
* -text
*.woff binary
*.ttf binary
*.eot binary
6 changes: 2 additions & 4 deletions docs/3-customizing/02-fonts.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ For example:
font-style: normal;
font-weight: 400;
src: local("72"),
url(https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff2?ui5-webcomponents) format("woff2");
}
................
Expand Down Expand Up @@ -49,8 +48,7 @@ In order to use the `72-Light` font in your app and have an additional setting (
font-weight: 200;
font-display: swap;
src: local("72-Light"),
url(https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff2?ui5-webcomponents) format("woff2");
}
</style>
```
27 changes: 9 additions & 18 deletions packages/base/src/css/FontFace.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
font-style: normal;
font-weight: 400;
src: local("72"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff2?ui5-webcomponents) format("woff2");
}

@font-face {
font-family: "72full";
font-style: normal;
font-weight: 400;
src: local('72-full'),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular-full.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular-full.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular-full.woff2?ui5-webcomponents) format("woff2");

}

Expand All @@ -22,54 +20,47 @@
font-style: normal;
font-weight: 700;
src: local('72-Bold'),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff2?ui5-webcomponents) format("woff2");
}

@font-face {
font-family: "72full";
font-style: normal;
font-weight: 700;
src: local('72-Bold-full'),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff2?ui5-webcomponents) format("woff2");
}

@font-face {
font-family: '72-Bold';
font-style: normal;
src: local('72-Bold'),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff2?ui5-webcomponents) format("woff2");
}

@font-face {
font-family: '72-Boldfull';
font-style: normal;
src: url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff?ui5-webcomponents) format("woff");
src: url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff2?ui5-webcomponents) format("woff2");
}

@font-face {
font-family: '72-Light';
font-style: normal;
src: local('72-Light'),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff?ui5-webcomponents) format("woff");
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff2?ui5-webcomponents) format("woff2");
}

@font-face {
font-family: '72-Lightfull';
font-style: normal;
src: url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light-full.woff2?ui5-webcomponents) format("woff2"),
url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light-full.woff?ui5-webcomponents) format("woff");
src: url(https://ui5.sap.com/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light-full.woff2?ui5-webcomponents) format("woff2");
}

@font-face {
font-family: "72Black";
font-style: bold;
font-weight: 900;
src: local('72Black'),
url(https://openui5nightly.hana.ondemand.com/resources/sap/ui/core/themes/sap_horizon/fonts/72-Black.woff2?ui5-webcomponents) format("woff2"),
url(https://openui5nightly.hana.ondemand.com/resources/sap/ui/core/themes/sap_horizon/fonts/72-Black.woff?ui5-webcomponents) format("woff");
url(https://openui5nightly.hana.ondemand.com/resources/sap/ui/core/themes/sap_horizon/fonts/72-Black.woff2?ui5-webcomponents) format("woff2");
}
8 changes: 0 additions & 8 deletions packages/main/test/pages/css/css_variables.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,21 +433,13 @@
--sapChart_Sequence_10: #ee6868;
--sapChart_Sequence_11: #2f6497;
--sapChart_Sequence_Neutral: #848f94;
--sapFontUrl_SAP-icons_ttf: url('../../../Base/baseLib/sap_fiori_3/fonts/SAP-icons.ttf');
--sapFontUrl_SAP-icons_woff: url('../../../Base/baseLib/sap_fiori_3/fonts/SAP-icons.woff');
--sapFontUrl_SAP-icons_woff2: url('../../../Base/baseLib/sap_fiori_3/fonts/SAP-icons.woff2');
--sapFontUrl_72_Regular_woff2: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Regular.woff2');
--sapFontUrl_72_Regular_woff: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Regular.woff');
--sapFontUrl_72_Bold_woff2: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Bold.woff2');
--sapFontUrl_72_Bold_woff: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Bold.woff');
--sapFontUrl_72_Light_woff2: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Light.woff2');
--sapFontUrl_72_Light_woff: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Light.woff');
--sapFontUrl_72_Regular_full_woff2: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Regular-full.woff2');
--sapFontUrl_72_Regular_full_woff: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Regular-full.woff');
--sapFontUrl_72_Bold_full_woff2: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Bold-full.woff2');
--sapFontUrl_72_Bold_full_woff: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Bold-full.woff');
--sapFontUrl_72_Light_full_woff2: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Light-full.woff2');
--sapFontUrl_72_Light_full_woff: url('../../../Base/baseLib/sap_base_fiori/fonts/72-Light-full.woff');
}
.background-image--sapCompanyLogo {
background-image: var(--sapCompanyLogo);
Expand Down
6 changes: 2 additions & 4 deletions packages/playground/_sass/navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@

@font-face {
font-family: "72-Bold";
src: url(../fonts/72-Bold.woff2) format("woff2"),
url(../fonts/72-Bold.woff) format("woff");
src: url(../fonts/72-Bold.woff2) format("woff2");
}

@font-face {
font-family: "72-Regular";
src: url(../fonts/72-Regular.woff2) format("woff2"),
url(../fonts/72-Regular.woff) format("woff");
src: url(../fonts/72-Regular.woff2) format("woff2");
}

.navigation-list {
Expand Down
9 changes: 3 additions & 6 deletions packages/playground/assets/css/landing-page.css
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
@font-face {
font-family: "72-Bold";
src: url(../fonts/72-Bold.woff2) format("woff2"),
url(../fonts/72-Bold.woff) format("woff");
src: url(../fonts/72-Bold.woff2) format("woff2");
}

@font-face {
font-family: "72-Regular";
src: url(../fonts/72-Regular.woff2) format("woff2"),
url(../fonts/72-Regular.woff) format("woff");
src: url(../fonts/72-Regular.woff2) format("woff2");
}

@font-face {
font-family: "72-Light";
src: url(../fonts/72-Light.woff2) format("woff2"),
url(../fonts/72-Light.woff) format("woff");
src: url(../fonts/72-Light.woff2) format("woff2");
}

body {
Expand Down
Binary file removed packages/playground/assets/fonts/72-Bold.woff
View file
Binary file not shown.
Binary file removed packages/playground/assets/fonts/72-Light.woff
View file
Binary file not shown.
Binary file removed packages/playground/assets/fonts/72-Regular.woff
View file
Binary file not shown.

0 comments on commit e4175cd

Please sign in to comment.