diff options
| author | Denis Anisimov <denis@vaadin.com> | 2014-11-08 12:47:05 +0200 |
|---|---|---|
| committer | Denis Anisimov <denis@vaadin.com> | 2014-11-15 17:11:07 +0200 |
| commit | 1d12fc07677debcac711586b5a57c2f397f3ec1f (patch) | |
| tree | d4af3045c791e75397d98a70011d47e2e41e38ae /WebContent/VAADIN | |
| parent | 488b4694519ee5d3451a5a6d70868d74b9cd8682 (diff) | |
| download | vaadin-framework-1d12fc07677debcac711586b5a57c2f397f3ec1f.tar.gz vaadin-framework-1d12fc07677debcac711586b5a57c2f397f3ec1f.zip | |
Set v-bevel to 'false' should unset 'v-textfield-bevel' value (#14634).
Change-Id: Ia3598b9bcef280bef38daa189ab3c7885e5d535a
Diffstat (limited to 'WebContent/VAADIN')
3 files changed, 10 insertions, 1 deletions
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. |