diff options
| author | John Ahlroos <john@vaadin.com> | 2012-10-12 16:05:49 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-10-16 13:05:41 +0300 |
| commit | 014f752f5620433cc0f429821c6464534227dfc9 (patch) | |
| tree | 43293e5b330a752397d68344333f3d9a43d0648c /WebContent/VAADIN/themes/reindeer | |
| parent | 081d5dc14015838be5b358632474997a8b8855ba (diff) | |
| download | vaadin-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/reindeer')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss | 8 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss b/WebContent/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss new file mode 100644 index 0000000000..19402f8208 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss @@ -0,0 +1,8 @@ +@mixin reindeer-inlinedatefield ($name : v-inline-datefield) { + + @include reindeer-datefield(v-inline-datefield); + + .#{$name} { + line-height:14px; /* Override popup datefields line-height:0 to get correct line heights */ + } +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss index e102e99bc5..ef827190b5 100644 --- a/WebContent/VAADIN/themes/reindeer/reindeer.scss +++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss @@ -9,6 +9,7 @@ @import "common/common.scss"; @import "datefield/datefield.scss"; +@import "inlinedatefield/inlinedatefield.scss"; @import "formlayout/formlayout.scss"; @import "label/label.scss"; @import "layouts/layouts.scss"; @@ -39,6 +40,7 @@ @include reindeer-nativebutton; @include reindeer-common; @include reindeer-datefield; + @include reindeer-inlinedatefield; @include reindeer-formlayout; @include reindeer-label; @include reindeer-layouts; |