From 0249ef2bb3531f3346a501d41eaef1cb5b0c3183 Mon Sep 17 00:00:00 2001 From: Uliana Caceres <2720077+UlianaMunich@users.noreply.github.com> Date: Thu, 12 May 2022 12:04:58 +0200 Subject: [PATCH] Update Fundamental Styles v0.23.0 in Luigi Core (#2698) --- core/fundamentalStyleClasses.js | 3 +- core/package-lock.json | 12 ++-- core/package.json | 4 +- core/src/styles/_fonts.scss | 116 ++++++++++++++++---------------- core/webpack-common-rules.js | 2 +- 5 files changed, 69 insertions(+), 68 deletions(-) diff --git a/core/fundamentalStyleClasses.js b/core/fundamentalStyleClasses.js index 7f8340546b..705941392f 100644 --- a/core/fundamentalStyleClasses.js +++ b/core/fundamentalStyleClasses.js @@ -1,5 +1,6 @@ module.exports = [ - './node_modules/fundamental-styles/dist/variables.css', + './node_modules/@sap-theming/theming-base-content/content/Base/baseLib/sap_fiori_3/css_variables.css', + './node_modules/fundamental-styles/dist/theming/sap_fiori_3.css', './node_modules/fundamental-styles/dist/icon.css', './node_modules/fundamental-styles/dist/layout.css', './node_modules/fundamental-styles/dist/action-bar.css', diff --git a/core/package-lock.json b/core/package-lock.json index 1208ee7a8e..e763927a5c 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -977,9 +977,9 @@ "dev": true }, "@sap-theming/theming-base-content": { - "version": "11.1.34", - "resolved": "https://registry.npmjs.org/@sap-theming/theming-base-content/-/theming-base-content-11.1.34.tgz", - "integrity": "sha512-xzJ6eZHyxzJCuve6IVAhBkWoCUpM81Vgmfc4H1EJ/+gY7VTsJK4AXcHm/RTby+33zp4+b6NzM7tSL2RmxwsJtA==", + "version": "11.1.35", + "resolved": "https://registry.npmjs.org/@sap-theming/theming-base-content/-/theming-base-content-11.1.35.tgz", + "integrity": "sha512-6OZQhpiUgKzT1u0ksJBO2WoijEMz6GT4c/e60HbZBzRXqhNiLl/UglsxBeQwy4rSOd59ogL8ygvKpvKcpTSRtA==", "dev": true }, "@sinonjs/commons": { @@ -4755,9 +4755,9 @@ "dev": true }, "fundamental-styles": { - "version": "0.20.3", - "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.20.3.tgz", - "integrity": "sha512-mv4jy6gYUil14j+RgG5Xl8eYQcErLKR2TXrwrjaLg1Su+PcRRoFPsOEycIaASSjvA2wjgrFlyXhNQ79sfpTodA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.23.0.tgz", + "integrity": "sha512-A5VtoDI8GebDziLmP4e1S4RXwlagglCgBUfHBCCe7OPzbIWH1s4rQ1mO6rp+Gd8aj0uvIe1mkHi+pNKEdqSg2Q==", "dev": true }, "gauge": { diff --git a/core/package.json b/core/package.json index 9b13d60082..87274aef77 100644 --- a/core/package.json +++ b/core/package.json @@ -10,7 +10,7 @@ "@babel/polyfill": "^7.6.0", "@babel/preset-env": "^7.6.2", "@babel/register": "^7.6.2", - "@sap-theming/theming-base-content": "~11.1.30", + "@sap-theming/theming-base-content": "11.1.35", "@webcomponents/webcomponentsjs": "^2.3.0", "acorn": "^6.4.1", "axios": ">=0.21.2", @@ -24,7 +24,7 @@ "esm": "^3.2.25", "file-loader": "^2.0.0", "fs-extra": "9.0.0", - "fundamental-styles": "^0.20.0", + "fundamental-styles": "0.23.0", "glob-parent": ">=5.1.2", "jsdom": "15.0.0", "jsdom-global": "3.0.2", diff --git a/core/src/styles/_fonts.scss b/core/src/styles/_fonts.scss index 22c170b16c..03c5f66fbc 100644 --- a/core/src/styles/_fonts.scss +++ b/core/src/styles/_fonts.scss @@ -1,59 +1,59 @@ @font-face { - font-family: '72'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Light-full.woff') - format('woff'); - font-weight: 300; - font-style: normal; -} -@font-face { - font-family: '72'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Light-full.woff2') - format('woff2'); - font-weight: 300; - font-style: normal; -} - -@font-face { - font-family: '72'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Bold-full.woff') - format('woff'); - font-weight: 700; - font-style: normal; -} -@font-face { - font-family: '72'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Bold-full.woff2') - format('woff2'); - font-weight: 700; - font-style: normal; -} - -@font-face { - font-family: '72'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Regular-full.woff') - format('woff'); - font-weight: 400; - font-style: normal; -} -@font-face { - font-family: '72'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Regular-full.woff2') - format('woff2'); - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: 'SAP-icons'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/SAP-icons.woff') - format('woff'); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: 'SAP-icons'; - src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/SAP-icons.woff2') - format('woff2'); - font-weight: normal; - font-style: normal; -} + font-family: '72'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Light-full.woff') + format('woff'); + font-weight: 300; + font-style: normal; + } + @font-face { + font-family: '72'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Light-full.woff2') + format('woff2'); + font-weight: 300; + font-style: normal; + } + + @font-face { + font-family: '72'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Bold-full.woff') + format('woff'); + font-weight: 700; + font-style: normal; + } + @font-face { + font-family: '72'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Bold-full.woff2') + format('woff2'); + font-weight: 700; + font-style: normal; + } + + @font-face { + font-family: '72'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Regular-full.woff') + format('woff'); + font-weight: 400; + font-style: normal; + } + @font-face { + font-family: '72'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/72-Regular-full.woff2') + format('woff2'); + font-weight: 400; + font-style: normal; + } + + @font-face { + font-family: 'SAP-icons'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/SAP-icons.woff') + format('woff'); + font-weight: normal; + font-style: normal; + } + @font-face { + font-family: 'SAP-icons'; + src: url('../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/SAP-icons.woff2') + format('woff2'); + font-weight: normal; + font-style: normal; + } \ No newline at end of file diff --git a/core/webpack-common-rules.js b/core/webpack-common-rules.js index 483744fcf5..fc7c89da26 100644 --- a/core/webpack-common-rules.js +++ b/core/webpack-common-rules.js @@ -53,7 +53,7 @@ module.exports = { test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/, loader: 'url-loader', options: { - limit: 50000 + limit: 5000 } } };