summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2012-10-12 16:05:49 +0300
committerJohn Ahlroos <john@vaadin.com>2012-10-16 13:05:41 +0300
commit014f752f5620433cc0f429821c6464534227dfc9 (patch)
tree43293e5b330a752397d68344333f3d9a43d0648c /WebContent/VAADIN/themes/base
parent081d5dc14015838be5b358632474997a8b8855ba (diff)
downloadvaadin-framework-014f752f5620433cc0f429821c6464534227dfc9.tar.gz
vaadin-framework-014f752f5620433cc0f429821c6464534227dfc9.zip
Fixed primary stylename handling for Datefield and InlineDatefield #9903
Change-Id: I4fb460a19a2bf40131172319070edde78851c4a7
Diffstat (limited to 'WebContent/VAADIN/themes/base')
-rw-r--r--WebContent/VAADIN/themes/base/base.scss2
-rw-r--r--WebContent/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss5
2 files changed, 7 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index 8a126476bc..7e2e20a969 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -10,6 +10,7 @@
@import "customcomponent/customcomponent.scss";
@import "customlayout/customlayout.scss";
@import "datefield/datefield.scss";
+@import "inlinedatefield/inlinedatefield.scss";
@import "dragwrapper/dragwrapper.scss";
@import "embedded/embedded.scss";
@import "formlayout/formlayout.scss";
@@ -60,6 +61,7 @@
@include base-customcomponent;
@include base-customlayout;
@include base-datefield;
+ @include base-inline-datefield;
@include base-dragwrapper;
@include base-embedded;
@include base-formlayout;
diff --git a/WebContent/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss b/WebContent/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
new file mode 100644
index 0000000000..0c42979b6b
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
@@ -0,0 +1,5 @@
+@mixin base-inline-datefield($name : v-inline-datefield){
+
+ /* FIXME $name should be passed to the the mixing instead of the default. Fix when SASS compiler works. #9821 */
+ @include base-datefield(v-inline-datefield);
+} \ No newline at end of file