From 43594976a70a0363ed3beff8e2e9d698b115d8b5 Mon Sep 17 00:00:00 2001
From: Mikhail Shabarov <61410877+mshabarov@users.noreply.github.com>
Date: Tue, 26 Oct 2021 11:29:26 +0300
Subject: [PATCH] chore: Remove unnecessary CSS wrapping (#12021)

---
 .../plugins/application-theme-plugin/theme-generator.js     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js b/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js
index 0e6d4a53a60..ceede21f07d 100644
--- a/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js
+++ b/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js
@@ -105,7 +105,7 @@ function generateThemeFile(themeFolder, themeName, themeProperties, productionMo
   let themeFile = headerImport;
 
   if (componentsFiles.length > 0) {
-    themeFile += 'import { css, unsafeCSS, registerStyles } from \'@vaadin/vaadin-themable-mixin/register-styles\';\n';
+    themeFile += 'import { unsafeCSS, registerStyles } from \'@vaadin/vaadin-themable-mixin/register-styles\';\n';
   }
 
   if (themeProperties.parent) {
@@ -202,9 +202,7 @@ function generateThemeFile(themeFolder, themeName, themeProperties, productionMo
 // Don't format as the generated file formatting will get wonky!
     const componentString = `registerStyles(
       '${tag}',
-      css\`
-        \${unsafeCSS(${variable}.toString())}
-      \`
+      unsafeCSS(${variable}.toString())
     );
     `;
     componentCssCode.push(componentString);