aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorAnna Koskinen <Ansku@users.noreply.github.com>2019-08-16 13:49:38 +0300
committerOlli Tietäväinen <ollit@vaadin.com>2019-08-16 13:49:38 +0300
commitbcb5aada51b1f70fbf26355b039b4d4a6b3c2987 (patch)
tree53e4ce376e466fccc260ab7c84c8799868557b77 /themes
parent799345c82c4705ca9bf6a28fbc91f01d20ff75fb (diff)
downloadvaadin-framework-bcb5aada51b1f70fbf26355b039b4d4a6b3c2987.tar.gz
vaadin-framework-bcb5aada51b1f70fbf26355b039b4d4a6b3c2987.zip
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
Diffstat (limited to 'themes')
-rw-r--r--themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss6
-rw-r--r--themes/src/main/themes/VAADIN/themes/valo/components/_datefield.scss6
2 files changed, 12 insertions, 0 deletions
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;
+ }
+ }
}
}