Skip to content

Commit 95dffd1

Browse files
authored
chore: remove redundant font face override (#12160)
1 parent 3b67132 commit 95dffd1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+63
-139
lines changed

packages/base/src/FontFace.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { hasStyle, createStyle } from "./ManagedStyles.js";
22
import { getFeature } from "./FeaturesRegistry.js";
33
import fontFaceCSS from "./generated/css/FontFace.css.js";
4-
import overrideFontFaceCSS from "./generated/css/OverrideFontFace.css.js";
54
import type OpenUI5Support from "./features/OpenUI5Support.js";
65
import { getDefaultFontLoading } from "./config/Fonts.js";
76

@@ -12,9 +11,6 @@ const insertFontFace = () => {
1211
if ((!openUI5Support || !openUI5Support.isOpenUI5Detected())) {
1312
insertMainFontFace();
1413
}
15-
16-
// Always set the override font - OpenUI5 in CSS Vars mode does not set it, unlike the main font
17-
insertOverrideFontFace();
1814
};
1915

2016
const insertMainFontFace = () => {
@@ -29,10 +25,4 @@ const insertMainFontFace = () => {
2925
}
3026
};
3127

32-
const insertOverrideFontFace = () => {
33-
if (!hasStyle("data-ui5-font-face-override")) {
34-
createStyle(overrideFontFaceCSS, "data-ui5-font-face-override");
35-
}
36-
};
37-
3828
export default insertFontFace;

packages/base/src/css/MultipleDragGhost.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
display: flex;
66
color: var(--sapList_TextColor);
77
background-color: var(--sapList_Background);
8-
font-family: "72override", var(--sapFontFamily);
8+
font-family: var(--sapFontFamily);
99
height: var(--sapElement_LineHeight);
1010
border-bottom: var(--sapList_BorderWidth) solid var(--sapList_BorderColor);
1111
/* drag and drop related */

packages/base/src/css/OverrideFontFace.css

Lines changed: 0 additions & 32 deletions
This file was deleted.

packages/compat/src/themes/GrowingButton.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
.ui5-table-growing-row-subtext {
4949
width: 100%;
5050
text-align: center;
51-
font-family: "72override", var(--sapFontFamily);
51+
font-family: var(--sapFontFamily);
5252
white-space: nowrap;
5353
overflow: hidden;
5454
text-overflow: ellipsis;

packages/compat/src/themes/Table.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ table {
3636
.ui5-table-header-row {
3737
color: var(--sapList_HeaderTextColor);
3838
height: var(--ui5_table_header_row_height);
39-
font-family: "72override", var(--sapFontFamily);
39+
font-family: var(--sapFontFamily);
4040
font-size: var(--sapFontSize);
4141
font-weight: var(--ui5_table_header_row_font_weight);
4242
border-bottom: var(--ui5_table_header_row_border_width) solid var(--ui5_table_header_row_border_bottom_color);
@@ -59,7 +59,7 @@ tr {
5959
justify-content: center;
6060
text-align: center;
6161
padding: 0.5rem 1rem;
62-
font-family: "72override", var(--sapFontFamily);
62+
font-family: var(--sapFontFamily);
6363
font-size: 0.875rem;
6464
box-sizing: border-box;
6565
color: var(--sapTextColor);

packages/compat/src/themes/TableCell.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:host {
22
display: table-cell;
3-
font-family: "72override", var(--sapFontFamily);
3+
font-family: var(--sapFontFamily);
44
font-size: 0.875rem;
55
height: var(--ui5_table_row_height);
66
box-sizing: border-box;

packages/compat/src/themes/TableGroupRow.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
border-width: var(--ui5_table_border_width);
1515
background-color: var(--sapList_TableGroupHeaderBackground);
1616
color: var(--sapList_TableGroupHeaderTextColor);
17-
font-family: "72override", var(--sapFontFamily);
17+
font-family: var(--sapFontFamily);
1818
font-size: var(--sapFontSize);
1919
font-weight: var(--ui5_table_group_row_font-weight);
2020
}

packages/compat/src/themes/TableRow.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
.ui5-table-row-popin-title {
7878
color: var(--sapContent_LabelColor);
79-
font-family: "72override", var(--sapFontFamily);
79+
font-family: var(--sapFontFamily);
8080
font-size: var(--sapFontSize);
8181
}
8282

packages/fiori/src/themes/NavigationMenuItem.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020

2121
::slotted([ui5-navigation-menu-item]) {
22-
font-family: "72override", var(--sapFontFamily);
22+
font-family: var(--sapFontFamily);
2323
}
2424

2525
:host([design="Action"]) {

packages/fiori/src/themes/NotificationListGroupItem.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
.ui5-nli-group-title-text {
7070
color: var(--sapGroup_TitleTextColor);
71-
font-family: "72override", var(--sapFontFamily);
71+
font-family: var(--sapFontFamily);
7272
font-size: var(--sapFontHeader5Size);
7373
font-weight: bold;
7474
white-space: nowrap;

0 commit comments

Comments
 (0)