From 1d12fc07677debcac711586b5a57c2f397f3ec1f Mon Sep 17 00:00:00 2001 From: Denis Anisimov Date: Sat, 8 Nov 2014 12:47:05 +0200 Subject: Set v-bevel to 'false' should unset 'v-textfield-bevel' value (#14634). Change-Id: Ia3598b9bcef280bef38daa189ab3c7885e5d535a --- WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss | 3 +++ WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss | 6 ++++++ WebContent/VAADIN/themes/valo/components/_textfield.scss | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss create mode 100644 WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss new file mode 100644 index 0000000000..b1b215a40c --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss @@ -0,0 +1,3 @@ +$v-bevel: false; + +@import "../valo/valo"; diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss new file mode 100644 index 0000000000..96a3ca63b6 --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss @@ -0,0 +1,6 @@ +@import "variables"; +@import "../tests-valo/valotest"; + +.tests-valo-textfield-bevel { + @include valotest; +} diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/WebContent/VAADIN/themes/valo/components/_textfield.scss index 58f69e5e4c..50cb7b8042 100644 --- a/WebContent/VAADIN/themes/valo/components/_textfield.scss +++ b/WebContent/VAADIN/themes/valo/components/_textfield.scss @@ -14,7 +14,7 @@ $v-textfield-background-color--readonly: darkest-color($v-app-background-color, * The bevel style for text fields. See the documentation for $v-bevel. * @group textfield */ -$v-textfield-bevel: inset 0 1px 0 v-shade !default; +$v-textfield-bevel: if($v-bevel and ($v-bevel != none), inset 0 1px 0 v-shade, $v-bevel) !default; /** * The shadow style for text fields. See the documentation for $v-shadow. -- cgit v1.2.3