fix: The font face style tag is created only once (#1090)

SAP · Dec 23, 2019 · 1a09e13 · 1a09e13
1 parent 586c19b
commit 1a09e13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/packages/base/src/FontFace.js b/packages/base/src/FontFace.js
@@ -56,6 +56,10 @@ const fontFaceCSS = `
 `;
 
 const insertFontFace = () => {
+	if (document.querySelector(`head>style[data-ui5-font-face]`)) {
+		return;
+	}
+
 	createStyleInHead(fontFaceCSS, { "data-ui5-font-face": "" });
 };
 

diff --git a/packages/main/src/themes/List.css b/packages/main/src/themes/List.css
@@ -52,7 +52,7 @@
 	box-sizing: border-box;
 	-webkit-text-size-adjust: none;	/* To improve readability Mobile Safari automatically increases the size of small text so let's disable this */
 	font-size: var(--sapFontMediumSize);
-	font-family: var(--sapFontFamily,var(--sapFontFamily,"72","72full",Arial,Helvetica,sans-serif));
+	font-family: var(--sapFontFamily);
 	line-height: 2rem;
 	background-color: var(--sapList_FooterBackground);
 	color: var(--ui5_list_footer_text_color);

diff --git a/packages/main/src/themes/Switch.css b/packages/main/src/themes/Switch.css
@@ -69,7 +69,7 @@
 	min-width: 1.625rem;
 	padding: 0 0.125rem;
 	font-size: var(--sapFontSmallSize);
-	font-family: "72","72full",Arial,Helvetica,sans-serif;
+	font-family: var(--sapFontFamily);
 	text-transform: uppercase;
 	text-align: center;
 	color: var(--sapTextColor);

diff --git a/packages/main/src/themes/TableCell.css b/packages/main/src/themes/TableCell.css
@@ -1,6 +1,6 @@
 :host {
 	display: contents;
-	font-family: var(--sapFontFamily,var(--sapFontFamily,"72","72full",Arial,Helvetica,sans-serif));
+	font-family: var(--sapFontFamily);
 	font-size: 0.875rem;
 	height: 100%;
 	box-sizing: border-box;