diff options
| author | Henrik Paul <henrik@vaadin.com> | 2014-03-06 15:45:48 +0200 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2014-03-11 11:14:38 +0200 |
| commit | a7604cfaa21e0c5d8a075d2d563a61038d96f295 (patch) | |
| tree | 6a34a72ae21f0f117910fa834c08fa5a2cbb3292 /WebContent | |
| parent | 91559310f9b9ad5758944e2d36ab750b87b009a1 (diff) | |
| download | vaadin-framework-a7604cfaa21e0c5d8a075d2d563a61038d96f295.tar.gz vaadin-framework-a7604cfaa21e0c5d8a075d2d563a61038d96f295.zip | |
Makes Escalator autodetect the initial row height (#13239)
Change-Id: I0511bcf6814fa33d558712da2bc112b545468153
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/escalator/escalator.scss | 9 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer-tests/styles.css | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/escalator/escalator.scss b/WebContent/VAADIN/themes/base/escalator/escalator.scss index 21424bd456..6f85a541ee 100644 --- a/WebContent/VAADIN/themes/base/escalator/escalator.scss +++ b/WebContent/VAADIN/themes/base/escalator/escalator.scss @@ -100,6 +100,13 @@ $border-color: #aaa; -moz-box-sizing: border-box; box-sizing: border-box; overflow:hidden; + + /* + * Because Vaadin changes the font size after the initial render, we + * need to mention the font size here explicitly, otherwise automatic + * row height detection gets broken. + */ + font-size: $font-size; } .#{$primaryStyleName}-cell.frozen { @@ -107,4 +114,4 @@ $border-color: #aaa; z-index: 0; } -}
\ No newline at end of file +} diff --git a/WebContent/VAADIN/themes/reindeer-tests/styles.css b/WebContent/VAADIN/themes/reindeer-tests/styles.css index 679de01b9c..9dd88707d1 100644 --- a/WebContent/VAADIN/themes/reindeer-tests/styles.css +++ b/WebContent/VAADIN/themes/reindeer-tests/styles.css @@ -32,3 +32,7 @@ .popup-style .v-datefield-calendarpanel-body { background: yellow; } + +#escalator .v-escalator-body .v-escalator-cell { + height: 50px; +}
\ No newline at end of file |