From 9be76fa5d9051d4f436e0b5e37869630eea4bc19 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Mon, 2 Aug 2021 15:12:59 +0200 Subject: [PATCH] Move inline CSS Variables to end of file --- lib/index.js | 5 ++--- .../my/other/ui/lib/themes/base/library-RTL.css | 13 ++++++------- .../lib3/my/other/ui/lib/themes/base/library.css | 13 ++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/lib/index.js b/lib/index.js index fb6efe03..95da52f1 100644 --- a/lib/index.js +++ b/lib/index.js @@ -306,7 +306,6 @@ Builder.prototype.build = function(options) { })); const varsOverride = oVariableCollector.getAllVariables(); const cssVariablesSource = oCSSVariablesCollector.toLessVariables(varsOverride); - // eslint-disable-next-line no-unused-vars const cssVariablesOnly = oCSSVariablesCollector.getCssVariablesDeclaration(); let cssSkeletonRtl; @@ -407,9 +406,9 @@ Builder.prototype.build = function(options) { --sapThemeMetaData-UI5-${libraryNameDashed}: ${metadataJson}; } `; - result.css = additionalVariables + result.cssVariables + "\n" + result.css; + result.css += additionalVariables + result.cssVariables; if (options.rtl) { - result.cssRtl = additionalVariables + result.cssVariables + "\n" + result.cssRtl; + result.cssRtl += additionalVariables + result.cssVariables; } } diff --git a/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library-RTL.css b/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library-RTL.css index 3c8814ba..e1511f69 100644 --- a/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library-RTL.css +++ b/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library-RTL.css @@ -1,3 +1,9 @@ +.myOtherUiLibRule1 { + color: #fefefe; +} +.myOtherUiLibRule2 { + padding: 1px 4px 3px 2px; +} :root { --sapUiTheme-my-other-ui-lib: true; @@ -7,10 +13,3 @@ --_my_other_ui_lib_MyControl_color1: var(--color1); --_my_other_ui_lib_MyOtherControl_color1: var(--color1); } - -.myOtherUiLibRule1 { - color: #fefefe; -} -.myOtherUiLibRule2 { - padding: 1px 4px 3px 2px; -} diff --git a/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library.css b/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library.css index 7b541543..024760b2 100644 --- a/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library.css +++ b/test/expected/inlineCssVariables/lib3/my/other/ui/lib/themes/base/library.css @@ -1,3 +1,9 @@ +.myOtherUiLibRule1 { + color: #fefefe; +} +.myOtherUiLibRule2 { + padding: 1px 2px 3px 4px; +} :root { --sapUiTheme-my-other-ui-lib: true; @@ -7,10 +13,3 @@ --_my_other_ui_lib_MyControl_color1: var(--color1); --_my_other_ui_lib_MyOtherControl_color1: var(--color1); } - -.myOtherUiLibRule1 { - color: #fefefe; -} -.myOtherUiLibRule2 { - padding: 1px 2px 3px 4px; -}