From bcb5aada51b1f70fbf26355b039b4d4a6b3c2987 Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Fri, 16 Aug 2019 13:49:38 +0300 Subject: Read-only styles shouldn't override borderless background styles. (#11692) * Read-only styles shouldn't override borderless background styles. - Fixed for ComboBox and DateField styles, other tested components already do it right. Fixes #11671 * Merge branch 'master' into issue11671 --- themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss | 6 ++++++ .../src/main/themes/VAADIN/themes/valo/components/_datefield.scss | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'themes') diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss index 8e45fc4afc..21d38e9708 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss @@ -259,6 +259,12 @@ display: none; } } + + &.borderless { + [class*="input"] { + @include valo-textfield-borderless-style; + } + } } } diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_datefield.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_datefield.scss index 58baa5d6f7..c94a792d52 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_datefield.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_datefield.scss @@ -237,6 +237,12 @@ display: none; } } + + &.borderless { + [class*="textfield"] { + @include valo-textfield-borderless-style; + } + } } } -- cgit v1.2.3