From 39990a4045b4dd626db79ef5254c22ff8d590385 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Mon, 5 Mar 2012 13:20:41 +0200 Subject: Define .v-has-width/height instead of v-undefined-width/height (#8313) --- WebContent/VAADIN/themes/base/csslayout/csslayout.css | 12 ++++++------ WebContent/VAADIN/themes/reindeer/datefield/datefield.css | 13 +++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.css b/WebContent/VAADIN/themes/base/csslayout/csslayout.css index ec0ccc1f84..1a4cb10a77 100644 --- a/WebContent/VAADIN/themes/base/csslayout/csslayout.css +++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.css @@ -2,16 +2,16 @@ overflow: hidden; } .v-csslayout-margin, .v-csslayout-container { - height: 100%; - width: 100%; box-sizing: border-box; -moz-box-sizing: border-box; } -.v-undefined-width > .v-csslayout-margin, .v-undefined-width > .v-csslayout-margin > .v-csslayout-container { - width: auto; +.v-has-width > .v-csslayout-margin, +.v-has-width > .v-csslayout-margin > .v-csslayout-container { + width: 100%; } -.v-undefined-height > .v-csslayout-margin, .v-undefined-height > .v-csslayout-margin > .v-csslayout-container { - height: auto; +.v-has-height > .v-csslayout-margin, +.v-has-height > .v-csslayout-margin > .v-csslayout-container { + height: 100%; } .v-csslayout-margin-top { padding-top: 12px; diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index 9ca90fd733..da50d1cbbe 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -225,22 +225,19 @@ td.v-datefield-calendarpanel-nextyear { .v-op .v-datefield-popup { background: rgba(255,255,255,.95); } -.v-datefield-textfield { +.v-has-width > input.v-datefield-textfield { width: 100%; } -.v-undefined-width > .v-datefield-textfield { - width: auto; -} -.v-datefield-year.v-undefined-width > .v-datefield-textfield { +.v-datefield-year > .v-datefield-textfield { width: 4.5em; } -.v-datefield-month.v-undefined-width > .v-datefield-textfield { +.v-datefield-month > .v-datefield-textfield { width: 5.5em; } -.v-datefield-day.v-undefined-width > .v-datefield-textfield { +.v-datefield-day > .v-datefield-textfield { width: 6em; } -.v-datefield-full.v-undefined-width >.v-datefield-textfield { +.v-datefield-full >.v-datefield-textfield { width: 12.5em; } .v-datefield-popupcalendar input.v-datefield-textfield { -- cgit v1.2.3