diff options
| author | John Ahlroos <john@vaadin.com> | 2013-01-09 12:26:07 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-01-09 12:26:07 +0000 |
| commit | 6eddb25c475e3f4c3ba72fa9c18d6ca2bfadca95 (patch) | |
| tree | d0814a18cc99c2878e44cf4ae54125fae1dfeabe /WebContent | |
| parent | 63a7fdf83df3f43343ba4fdb878bdfc8ebf52204 (diff) | |
| parent | ac7f072fabb30ed0991b7cce1e7cb4ff45d4fa57 (diff) | |
| download | vaadin-framework-6eddb25c475e3f4c3ba72fa9c18d6ca2bfadca95.tar.gz vaadin-framework-6eddb25c475e3f4c3ba72fa9c18d6ca2bfadca95.zip | |
Merge "Removed incorrect fixes for #8294, fixing #10183"
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/datefield/datefield.scss | 1 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/select/select.scss | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.scss b/WebContent/VAADIN/themes/base/datefield/datefield.scss index 4099123764..1d3d408ed2 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.scss +++ b/WebContent/VAADIN/themes/base/datefield/datefield.scss @@ -3,7 +3,6 @@ .#{$primaryStyleName} { white-space: nowrap; display: inline-block; /* Force minimum width */ - line-height:0; /* Force minimum height */ } .#{$primaryStyleName}-textfield { vertical-align: top; diff --git a/WebContent/VAADIN/themes/base/select/select.scss b/WebContent/VAADIN/themes/base/select/select.scss index 80957b16a3..69d3c07272 100644 --- a/WebContent/VAADIN/themes/base/select/select.scss +++ b/WebContent/VAADIN/themes/base/select/select.scss @@ -105,9 +105,6 @@ $select-button-negative-width : -1em; border: none; vertical-align:top; } -.v-filterselect-suggestmenu tr{ - line-height:0; -} .v-filterselect-suggestmenu .gwt-MenuItem { white-space: nowrap; } |