diff --git a/flow-tests/test-application-theme/test-theme-component-live-reload/src/test/java/com/vaadin/flow/uitest/ui/ComponentThemeLiveReloadIT.java b/flow-tests/test-application-theme/test-theme-component-live-reload/src/test/java/com/vaadin/flow/uitest/ui/ComponentThemeLiveReloadIT.java index a2fcde6b388..cba9e0e2141 100644 --- a/flow-tests/test-application-theme/test-theme-component-live-reload/src/test/java/com/vaadin/flow/uitest/ui/ComponentThemeLiveReloadIT.java +++ b/flow-tests/test-application-theme/test-theme-component-live-reload/src/test/java/com/vaadin/flow/uitest/ui/ComponentThemeLiveReloadIT.java @@ -43,9 +43,9 @@ @NotThreadSafe public class ComponentThemeLiveReloadIT extends ChromeBrowserTest { - private static final String BORDER_RADIUS = "3px"; - private static final String OTHER_BORDER_RADIUS = "6px"; - private static final String PARENT_BORDER_RADIUS = "9px"; + private static final String BORDER_RADIUS = "11px"; + private static final String OTHER_BORDER_RADIUS = "17px"; + private static final String PARENT_BORDER_RADIUS = "23px"; private static final String THEMES_FOLDER = FrontendUtils.DEFAULT_FRONTEND_DIR + "/themes/"; diff --git a/flow-tests/test-application-theme/test-theme-reusable-vite/src/main/frontend/ts-component.ts b/flow-tests/test-application-theme/test-theme-reusable-vite/src/main/frontend/ts-component.ts index bc89c573950..0fcf7737d04 100644 --- a/flow-tests/test-application-theme/test-theme-reusable-vite/src/main/frontend/ts-component.ts +++ b/flow-tests/test-application-theme/test-theme-reusable-vite/src/main/frontend/ts-component.ts @@ -1,7 +1,6 @@ import { css, html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { applyTheme } from './generated/theme'; -import lumo from '@vaadin/vaadin-lumo-styles/lumo.css?inline'; @customElement('ts-component') export class TsComponent extends LitElement { @@ -11,7 +10,9 @@ export class TsComponent extends LitElement { } static get styles() { return css` - ${lumo}.toString() + [theme='badge'] { + background-color: rgba(51, 139, 255, 0.13); + } `; } render() { diff --git a/flow-tests/test-application-theme/test-theme-reusable-vite/src/test/java/com/vaadin/flow/uitest/ui/theme/TSIT.java b/flow-tests/test-application-theme/test-theme-reusable-vite/src/test/java/com/vaadin/flow/uitest/ui/theme/TSIT.java index be631492965..644c7f10526 100644 --- a/flow-tests/test-application-theme/test-theme-reusable-vite/src/test/java/com/vaadin/flow/uitest/ui/theme/TSIT.java +++ b/flow-tests/test-application-theme/test-theme-reusable-vite/src/test/java/com/vaadin/flow/uitest/ui/theme/TSIT.java @@ -24,7 +24,7 @@ public class TSIT extends ChromeBrowserTest { @Test - public void lumoBadgeIsRenderedCorrectly() { + public void inlineComponentStylesApplied() { open(); checkLogsForErrors(); diff --git a/flow-tests/test-embedding/test-embedding-application-theme/src/test/java/com/vaadin/flow/webcomponent/ApplicationThemeComponentIT.java b/flow-tests/test-embedding/test-embedding-application-theme/src/test/java/com/vaadin/flow/webcomponent/ApplicationThemeComponentIT.java index e192095131b..4524b399065 100644 --- a/flow-tests/test-embedding/test-embedding-application-theme/src/test/java/com/vaadin/flow/webcomponent/ApplicationThemeComponentIT.java +++ b/flow-tests/test-embedding/test-embedding-application-theme/src/test/java/com/vaadin/flow/webcomponent/ApplicationThemeComponentIT.java @@ -24,7 +24,6 @@ import org.openqa.selenium.WebElement; import com.vaadin.flow.component.html.testbench.DivElement; -import com.vaadin.flow.component.html.testbench.H1Element; import com.vaadin.flow.component.html.testbench.SpanElement; import com.vaadin.flow.testutil.ChromeBrowserTest; import com.vaadin.testbench.TestBenchElement; @@ -215,30 +214,11 @@ public void multipleSameEmbedded_cssTargetingDocumentShouldOnlyAddElementsOneTim 2l, getCommandExecutor().executeScript( "return document.head.querySelectorAll('link[rel=stylesheet][href^=\"https://fonts.googleapis.com\"]').length")); Assert.assertEquals( - "Project contains 4 css injections to document and all should be hashed", - 4l, getCommandExecutor().executeScript( + "Project contains 2 css injections to document and all should be hashed", + 2l, getCommandExecutor().executeScript( "return window.Vaadin.theme.injectedGlobalCss.length")); } - @Test - public void lumoImports_doNotLeakEmbeddingPage() { - open(); - checkLogsForErrors(); - - // Ensure embedded components are loaded before testing embedding page - validateEmbeddedComponent($("themed-component").id("first"), "first"); - validateEmbeddedComponent($("themed-component").id("second"), "second"); - - final H1Element element = $(H1Element.class).waitForFirst(); - Assert.assertFalse( - "Lumo styles (typography) should not have been applied to elements in embedding page", - element.getCssValue("font-family").contains("Roboto")); - Assert.assertEquals( - "Lumo styles (colors) should not have been applied to elements in embedding page", - "rgba(0, 0, 0, 1)", element.getCssValue("color")); - - } - @Test public void cssImportAnnotation_applyToEmbeddingPage() { open(); diff --git a/flow-tests/test-frontend/vite-basics/package.json b/flow-tests/test-frontend/vite-basics/package.json index fa3e7e3544a..cc8b452b70e 100644 --- a/flow-tests/test-frontend/vite-basics/package.json +++ b/flow-tests/test-frontend/vite-basics/package.json @@ -14,70 +14,75 @@ "@vaadin/testscope-all": "../vite-test-assets/packages/@vaadin/testscope-all", "@vaadin/testscope-button": "../vite-test-assets/packages/@vaadin/testscope-button", "@vaadin/testscope-map": "../vite-test-assets/packages/@vaadin/testscope-map", - "@vaadin/text-field": "25.0.5", - "@vaadin/vaadin-lumo-styles": "25.0.5", - "@vaadin/vaadin-themable-mixin": "25.0.5", "copy-to-clipboard": "^3.3.1", - "lit": "3.3.2", - "react": "19.2.4", - "react-dom": "19.2.4", - "react-router": "7.13.1" + "lit": "3.3.3", + "react": "19.2.6", + "react-dom": "19.2.6", + "react-router": "7.15.1" }, "devDependencies": { "@babel/core": "7.29.0", + "@babel/plugin-transform-react-jsx-development": "7.27.1", "@babel/preset-react": "7.28.5", + "@babel/types": "7.29.0", "@preact/signals-react-transform": "0.8.1", - "@rolldown/plugin-babel": "0.2.1", + "@rolldown/plugin-babel": "0.2.3", "@rollup/plugin-replace": "6.0.3", "@rollup/pluginutils": "5.3.0", - "@types/node": "25.5.0", - "@types/react": "19.2.14", + "@types/node": "25.9.1", + "@types/react": "19.2.15", "@types/react-dom": "19.2.3", - "@vitejs/plugin-react": "6.0.1", + "@vitejs/plugin-react": "6.0.2", "magic-string": "0.30.21", "rollup-plugin-brotli": "3.1.0", "rollup-plugin-visualizer": "7.0.1", "strip-css-comments": "5.0.0", "transform-ast": "2.4.4", - "typescript": "6.0.2", - "vite": "8.0.5", - "vite-plugin-checker": "0.12.0", - "workbox-build": "7.4.0" + "typescript": "6.0.3", + "vite": "8.0.14", + "vite-plugin-checker": "0.13.0" }, "vaadin": { "dependencies": { "@polymer/polymer": "3.5.2", "@vaadin/common-frontend": "0.0.22", - "@vaadin/text-field": "25.0.5", - "@vaadin/vaadin-lumo-styles": "25.0.5", - "@vaadin/vaadin-themable-mixin": "25.0.5", - "lit": "3.3.2", - "react": "19.2.4", - "react-dom": "19.2.4", - "react-router": "7.13.1" + "lit": "3.3.3", + "react": "19.2.6", + "react-dom": "19.2.6", + "react-router": "7.15.1" }, "devDependencies": { "@babel/core": "7.29.0", + "@babel/plugin-transform-react-jsx-development": "7.27.1", "@babel/preset-react": "7.28.5", + "@babel/types": "7.29.0", "@preact/signals-react-transform": "0.8.1", - "@rolldown/plugin-babel": "0.2.1", + "@rolldown/plugin-babel": "0.2.3", "@rollup/plugin-replace": "6.0.3", "@rollup/pluginutils": "5.3.0", - "@types/node": "25.5.0", - "@types/react": "19.2.14", + "@types/node": "25.9.1", + "@types/react": "19.2.15", "@types/react-dom": "19.2.3", - "@vitejs/plugin-react": "6.0.1", + "@vitejs/plugin-react": "6.0.2", "magic-string": "0.30.21", "rollup-plugin-brotli": "3.1.0", "rollup-plugin-visualizer": "7.0.1", "strip-css-comments": "5.0.0", "transform-ast": "2.4.4", - "typescript": "6.0.2", - "vite": "8.0.5", - "vite-plugin-checker": "0.12.0", - "workbox-build": "7.4.0" + "typescript": "6.0.3", + "vite": "8.0.14", + "vite-plugin-checker": "0.13.0" }, - "hash": "a6f125d0065f8904488235d44e4e522f7db5afecb3e0404c63e74d2ac8591ac5" + "hash": "8327859d8510ad6a16456239ce5905db6b1622684b644b5748078763d46e0232", + "overrides": { + "@polymer/polymer": "$@polymer/polymer", + "@vaadin/common-frontend": "$@vaadin/common-frontend", + "copy-to-clipboard": "$copy-to-clipboard", + "lit": "$lit", + "react": "$react", + "react-dom": "$react-dom", + "react-router": "$react-router" + } }, "pnpm": { "overrides": { @@ -87,21 +92,10 @@ "copy-to-clipboard": "$copy-to-clipboard", "@vaadin/test-package-outside-npm": "$@vaadin/test-package-outside-npm", "@vaadin/test-package2-outside-npm": "$@vaadin/test-package2-outside-npm", - "rollup-plugin-brotli": "$rollup-plugin-brotli", - "typescript": "$typescript", - "vite": "$vite", - "vite-plugin-checker": "$vite-plugin-checker", - "workbox-build": "$workbox-build", - "@rollup/plugin-replace": "$@rollup/plugin-replace", "@polymer/polymer": "$@polymer/polymer", "@vaadin/common-frontend": "$@vaadin/common-frontend", - "@vaadin/text-field": "$@vaadin/text-field", - "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles", - "@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin", "lit": "$lit", "react-dom": "$react-dom", - "@types/react-dom": "$@types/react-dom", - "@types/react": "$@types/react", "react": "$react", "react-router": "$react-router" } diff --git a/flow-tests/test-legacy-frontend/frontend/themes/app-theme/styles.css b/flow-tests/test-legacy-frontend/frontend/themes/app-theme/styles.css index 33b1d8910c2..9dcb26ba574 100644 --- a/flow-tests/test-legacy-frontend/frontend/themes/app-theme/styles.css +++ b/flow-tests/test-legacy-frontend/frontend/themes/app-theme/styles.css @@ -1,6 +1,8 @@ -@import '@vaadin/vaadin-lumo-styles/utility.css'; html, :host { - --lumo-primary-text-color: #008000; color: rgba(0, 0, 0, 1); /* black */ } + +.text-primary { + color: rgba(0, 128, 0, 1); /* green */ +} diff --git a/flow-tests/test-legacy-frontend/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java b/flow-tests/test-legacy-frontend/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java index 8ea1e0f18ef..e7b72030315 100644 --- a/flow-tests/test-legacy-frontend/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java +++ b/flow-tests/test-legacy-frontend/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java @@ -15,12 +15,9 @@ */ package com.vaadin.flow.uitest.ui.theme; -import com.vaadin.flow.component.dependency.NpmPackage; import com.vaadin.flow.component.page.AppShellConfigurator; import com.vaadin.flow.theme.Theme; -import com.vaadin.flow.uitest.ui.dependencies.TestVersion; @Theme(value = "app-theme") -@NpmPackage(value = "@fortawesome/fontawesome-free", version = TestVersion.FONTAWESOME) public class AppShell implements AppShellConfigurator { } diff --git a/flow-tests/test-legacy-frontend/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java b/flow-tests/test-legacy-frontend/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java index d6b9e21a854..a04f15bf754 100644 --- a/flow-tests/test-legacy-frontend/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java +++ b/flow-tests/test-legacy-frontend/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java @@ -24,7 +24,7 @@ public class UtilityClassNameIT extends ChromeBrowserTest { @Test - public void lumoUtils_customStylesHaveBeenExpanded() { + public void utilityClass_themeCssIsAppliedToElement() { open(); checkLogsForErrors(); diff --git a/flow-tests/test-lumo/src/main/java/com/vaadin/flow/theme/lumo/Lumo.java b/flow-tests/test-lumo/src/main/java/com/vaadin/flow/theme/lumo/Lumo.java index 735a5711108..e22b03c7fd1 100644 --- a/flow-tests/test-lumo/src/main/java/com/vaadin/flow/theme/lumo/Lumo.java +++ b/flow-tests/test-lumo/src/main/java/com/vaadin/flow/theme/lumo/Lumo.java @@ -22,21 +22,17 @@ import org.slf4j.LoggerFactory; -import com.vaadin.flow.component.dependency.CssImport; -import com.vaadin.flow.component.dependency.JsModule; -import com.vaadin.flow.component.dependency.NpmPackage; import com.vaadin.flow.theme.AbstractTheme; -import com.vaadin.flow.uitest.ui.dependencies.TestVersion; /** - * Lumo component theme class implementation. Used for testing theming features. - * - * @since 1.0 + * Lumo theme stub used by tests that rely on Flow's classpath detection of + * {@code com.vaadin.flow.theme.lumo.Lumo} as the default theme (see + * {@code AbstractDependenciesScanner.LUMO}). Provides the {@code LIGHT} / + * {@code DARK} variants and the standard + * {@link com.vaadin.flow.theme.AbstractTheme} contract without pulling in any + * Vaadin Lumo npm packages — tests that need real Lumo styling must declare + * those deps themselves. */ -@NpmPackage(value = "@vaadin/vaadin-themable-mixin", version = TestVersion.VAADIN) -@NpmPackage(value = "@vaadin/vaadin-lumo-styles", version = TestVersion.VAADIN) -@CssImport("@vaadin/vaadin-lumo-styles/lumo.css") -@JsModule("@vaadin/vaadin-lumo-styles/vaadin-iconset.js") public class Lumo implements AbstractTheme { public static final String LIGHT = "light"; diff --git a/flow-tests/test-theme-no-polymer/src/main/frontend/themes/app-theme/styles.css b/flow-tests/test-theme-no-polymer/src/main/frontend/themes/app-theme/styles.css index 33b1d8910c2..9dcb26ba574 100644 --- a/flow-tests/test-theme-no-polymer/src/main/frontend/themes/app-theme/styles.css +++ b/flow-tests/test-theme-no-polymer/src/main/frontend/themes/app-theme/styles.css @@ -1,6 +1,8 @@ -@import '@vaadin/vaadin-lumo-styles/utility.css'; html, :host { - --lumo-primary-text-color: #008000; color: rgba(0, 0, 0, 1); /* black */ } + +.text-primary { + color: rgba(0, 128, 0, 1); /* green */ +} diff --git a/flow-tests/test-theme-no-polymer/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java b/flow-tests/test-theme-no-polymer/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java index 8ea1e0f18ef..e7b72030315 100644 --- a/flow-tests/test-theme-no-polymer/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java +++ b/flow-tests/test-theme-no-polymer/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java @@ -15,12 +15,9 @@ */ package com.vaadin.flow.uitest.ui.theme; -import com.vaadin.flow.component.dependency.NpmPackage; import com.vaadin.flow.component.page.AppShellConfigurator; import com.vaadin.flow.theme.Theme; -import com.vaadin.flow.uitest.ui.dependencies.TestVersion; @Theme(value = "app-theme") -@NpmPackage(value = "@fortawesome/fontawesome-free", version = TestVersion.FONTAWESOME) public class AppShell implements AppShellConfigurator { } diff --git a/flow-tests/test-theme-no-polymer/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java b/flow-tests/test-theme-no-polymer/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java index d6b9e21a854..a04f15bf754 100644 --- a/flow-tests/test-theme-no-polymer/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java +++ b/flow-tests/test-theme-no-polymer/src/test/java/com/vaadin/flow/uitest/ui/theme/UtilityClassNameIT.java @@ -24,7 +24,7 @@ public class UtilityClassNameIT extends ChromeBrowserTest { @Test - public void lumoUtils_customStylesHaveBeenExpanded() { + public void utilityClass_themeCssIsAppliedToElement() { open(); checkLogsForErrors(); diff --git a/flow-tests/test-themes/src/main/frontend/css-loading-view/cssimport.css b/flow-tests/test-themes/src/main/frontend/css-loading-view/cssimport.css index 966f54105c3..a6ed85f4b33 100644 --- a/flow-tests/test-themes/src/main/frontend/css-loading-view/cssimport.css +++ b/flow-tests/test-themes/src/main/frontend/css-loading-view/cssimport.css @@ -1,8 +1,3 @@ .cssimport { background-color: orange; } - -/* This is the same rule that Lumo utilities define */ -.bg-contrast-20 { - background-color: orange; -} diff --git a/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.css b/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.css index 5123999f67c..4529ce4db67 100644 --- a/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.css +++ b/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.css @@ -3,16 +3,6 @@ background: green; } -/* This is the same rule that Lumo utilities define */ -.bg-contrast-60 { - color: white; - background-color: green; -} - -.bg-contrast { - color: white; -} - .container { display: flex; align-items: stretch; diff --git a/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.json b/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.json index e8f0da02543..55086eeadda 100644 --- a/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.json +++ b/flow-tests/test-themes/src/main/frontend/themes/app-theme/theme.json @@ -1,5 +1,4 @@ { - "lumoImports": ["typography", "color", "spacing", "badge"], "parent": "parent-theme", "importCss": ["@fortawesome/fontawesome-free/css/all.css"], "assets": { diff --git a/flow-tests/test-themes/src/main/frontend/themes/parent-theme/styles.css b/flow-tests/test-themes/src/main/frontend/themes/parent-theme/styles.css index 980c8ee0c8e..7cbb075fae7 100644 --- a/flow-tests/test-themes/src/main/frontend/themes/parent-theme/styles.css +++ b/flow-tests/test-themes/src/main/frontend/themes/parent-theme/styles.css @@ -6,9 +6,3 @@ body.bg { color: white; background: blue; } - -/* This is the same rule that Lumo utilities define */ -.bg-contrast-50 { - color: white; - background-color: blue; -} diff --git a/flow-tests/test-themes/src/main/frontend/themes/parent-theme/theme.json b/flow-tests/test-themes/src/main/frontend/themes/parent-theme/theme.json index 076f009d4b8..2c63c085104 100644 --- a/flow-tests/test-themes/src/main/frontend/themes/parent-theme/theme.json +++ b/flow-tests/test-themes/src/main/frontend/themes/parent-theme/theme.json @@ -1,3 +1,2 @@ { - "lumoImports": ["utility"] } diff --git a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java index 3d115794bdb..145b7b17582 100644 --- a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java +++ b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/AppShell.java @@ -15,7 +15,6 @@ */ package com.vaadin.flow.uitest.ui.theme; -import com.vaadin.flow.component.dependency.CssImport; import com.vaadin.flow.component.dependency.NpmPackage; import com.vaadin.flow.component.dependency.StyleSheet; import com.vaadin.flow.component.page.AppShellConfigurator; @@ -33,6 +32,5 @@ // url(...) inside an @import-ed CSS file must still resolve correctly when // the entry CSS is loaded. @StyleSheet("context://relurl-test/styles.css") -@CssImport("@vaadin/vaadin-lumo-styles/utility.css") public class AppShell implements AppShellConfigurator { } diff --git a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/CssLoadingView.java b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/CssLoadingView.java index 72e0f6874cf..ab6ebbb624a 100644 --- a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/CssLoadingView.java +++ b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/CssLoadingView.java @@ -64,8 +64,6 @@ public Expected(String expectedColor) { idToExpectedColor.put("stylesheetVsAddStylesheet", "purple"); idToExpectedColor.put("addStylesheetVsCssImport", "yellow"); idToExpectedColor.put("laterAddStylesheetVsCssImport", "darkgoldenrod"); - idToExpectedColor.put("cssImportVsLumo", "orange"); - idToExpectedColor.put("lumo", "hsl(214, 35%, 15%)"); } public CssLoadingView() { @@ -107,15 +105,6 @@ public CssLoadingView() { add(wrap("laterAddStylesheetVsCssImport", laterAddStylesheetVsCssImport)); - Span cssImportVsLumo = new Span( - "CSSImport vs Lumo, should be orange from cssimport"); - cssImportVsLumo.addClassNames("compare", "bg-contrast-20"); - add(wrap("cssImportVsLumo", cssImportVsLumo)); - - Span lumo = new Span("Lumo, should be quite black"); - lumo.addClassNames("compare", "bg-contrast"); - add(wrap("lumo", lumo)); - // Regression target for https://github.com/vaadin/flow/issues/24164: // .relurl-test-target's background-image is defined in // webapp/relurl-test/views/messages.css using a relative diff --git a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java index 38fca8109c2..2830932bb20 100644 --- a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java +++ b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java @@ -35,7 +35,6 @@ public class ThemeView extends Div { public static final String KEYBOARD_ID = "keyboard"; public static final String LEMON_ID = "lemon"; public static final String SUN_ID = "sun"; - public static final String LUMO_BORDER_TOP_DIV = "lumo-border-top-div"; public ThemeView() { UI.getCurrent().getPage() @@ -89,12 +88,5 @@ public ThemeView() { sunIconFromParentTheme.setId(SUN_ID); add(keyboardIconFromParentTheme, lemonIconFromParentTheme, sunIconFromParentTheme); - - add(new Div()); - - Div lumoBorderDiv = new Div("This element has Lumo border style"); - lumoBorderDiv.addClassName("border-t"); - lumoBorderDiv.setId(LUMO_BORDER_TOP_DIV); - add(lumoBorderDiv); } } diff --git a/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet-later.css b/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet-later.css index 7a15d166fa8..da3c809e1fc 100644 --- a/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet-later.css +++ b/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet-later.css @@ -2,8 +2,3 @@ color: black; background-color: darkgoldenrod; } - -/* This is the same rule that Lumo utilities define */ -.bg-contrast-10 { - background-color: darkgoldenrod; -} diff --git a/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet.css b/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet.css index 980f83f1b2d..6e6eb6efc40 100644 --- a/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet.css +++ b/flow-tests/test-themes/src/main/webapp/styles/page-addstylesheet.css @@ -2,8 +2,3 @@ color: black; background-color: yellow; } - -/* This is the same rule that Lumo utilities define */ -.bg-contrast-30 { - background-color: yellow; -} diff --git a/flow-tests/test-themes/src/main/webapp/styles/stylesheet.css b/flow-tests/test-themes/src/main/webapp/styles/stylesheet.css index 5438e0623b9..bda35649649 100644 --- a/flow-tests/test-themes/src/main/webapp/styles/stylesheet.css +++ b/flow-tests/test-themes/src/main/webapp/styles/stylesheet.css @@ -2,8 +2,3 @@ color: white; background-color: purple; } - -/* This is the same rule that Lumo utilities define */ -.bg-contrast-40 { - background-color: purple; -} diff --git a/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/CssLoadingIT.java b/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/CssLoadingIT.java index f6a1070d4a7..8f5f3ef1128 100644 --- a/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/CssLoadingIT.java +++ b/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/CssLoadingIT.java @@ -24,8 +24,8 @@ /** * Test CSS loading order from different sources. * - * The expected priority is: Lumo styles < @CssImport < page.addStylesheet - * < @Stylehseet < parent theme < current theme (app theme) + * The expected priority is: @CssImport < page.addStylesheet < @Stylehseet < + * parent theme < current theme (app theme) */ public class CssLoadingIT extends ChromeBrowserTest { diff --git a/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/ThemeIT.java b/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/ThemeIT.java index b7367c14d50..303ab76a80a 100644 --- a/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/ThemeIT.java +++ b/flow-tests/test-themes/src/test/java/com/vaadin/flow/uitest/ui/theme/ThemeIT.java @@ -39,7 +39,6 @@ import static com.vaadin.flow.uitest.ui.theme.ThemeView.FONTAWESOME_ID; import static com.vaadin.flow.uitest.ui.theme.ThemeView.KEYBOARD_ID; import static com.vaadin.flow.uitest.ui.theme.ThemeView.LEMON_ID; -import static com.vaadin.flow.uitest.ui.theme.ThemeView.LUMO_BORDER_TOP_DIV; import static com.vaadin.flow.uitest.ui.theme.ThemeView.OCTOPUSS_ID; import static com.vaadin.flow.uitest.ui.theme.ThemeView.SNOWFLAKE_ID; import static com.vaadin.flow.uitest.ui.theme.ThemeView.SUB_COMPONENT_ID; @@ -259,23 +258,6 @@ public void cssWithAssetRelativePaths_urlPathIsNotRelative() { imageUrl.matches(String.format(expectedIconsURL, "sun.svg"))); } - /** - * Main theme.json does not include utility Lumo import which has border - * styling etc. Parent theme.json does include Lumo utility import. - */ - @Test - public void parentTheme_lumoStyleAppliedFromParentTheme() { - open(); - WebElement cssNodeLumoBorderDiv = findElement( - By.id(LUMO_BORDER_TOP_DIV)); - Assert.assertEquals("solid", - cssNodeLumoBorderDiv.getCssValue("border-top-style")); - Assert.assertNotEquals("0px", - cssNodeLumoBorderDiv.getCssValue("border-top-width")); - Assert.assertEquals("rgba(26, 57, 96, 0.1)", - cssNodeLumoBorderDiv.getCssValue("border-top-color")); - } - @Override protected String getTestPath() { String path = super.getTestPath();