diff options
| author | Matti Hosio <mhosio@vaadin.com> | 2014-12-17 10:31:33 +0200 |
|---|---|---|
| committer | Matti Hosio <mhosio@vaadin.com> | 2014-12-17 10:31:33 +0200 |
| commit | e547f024533bef83b8c8c8e522240f34765c894d (patch) | |
| tree | 4610ad629b996df6d7882a8f9190922a467046d2 /WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss | |
| parent | 8a0a1bdb4630f39214a039a2689bfa5a1431a413 (diff) | |
| parent | a9f24b00e9ddcd5ca19ac2907e0bf2413f036af4 (diff) | |
| download | vaadin-framework-e547f024533bef83b8c8c8e522240f34765c894d.tar.gz vaadin-framework-e547f024533bef83b8c8c8e522240f34765c894d.zip | |
Merge remote-tracking branch 'origin/master' into declarative
Conflicts:
server/src/com/vaadin/ui/TextField.java
Change-Id: I289cb9ec80d494ab79aec11a43708abf5b403a00
Diffstat (limited to 'WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss')
| -rw-r--r-- | WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss b/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss new file mode 100644 index 0000000000..b941c1b3d1 --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss @@ -0,0 +1,6 @@ +@import "variables"; +@import "../tests-valo/valotest"; + +.tests-valo-disabled-animations { + @include valotest; +} |