diff options
| author | Jouni Koivuviita <jouni@jounikoivuviita.com> | 2012-04-19 15:35:08 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@jounikoivuviita.com> | 2012-04-19 15:35:08 +0300 |
| commit | 71201db2d366aef2b6325816e8caef3d43c0bdb6 (patch) | |
| tree | 016f2e01c4ac1236158e2deee03232fe9fa0934a /WebContent/VAADIN | |
| parent | 98b0268167ff2454cac41dac9f1ab2874886cc77 (diff) | |
| download | vaadin-framework-71201db2d366aef2b6325816e8caef3d43c0bdb6.tar.gz vaadin-framework-71201db2d366aef2b6325816e8caef3d43c0bdb6.zip | |
Fixed stuff related to BoxLayout
Diffstat (limited to 'WebContent/VAADIN')
4 files changed, 13 insertions, 12 deletions
diff --git a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css index fba94a8edc..0d2f7312fb 100644 --- a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css +++ b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css @@ -1,3 +1,15 @@ +/* THIS IS HERE ONLY BECAUSE WE WANT TO DEFINE IT FIRST, TO MAKE IT EASY TO OVERRIDE */ +.v-connector { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + text-align: left; + display: inline-block; + white-space: normal; +} + +/* Actual AbsoluteLayout styles begin here */ + .v-absolutelayout-wrapper { position: absolute; overflow: hidden; diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css index a16b85fc65..3188d68520 100644 --- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css +++ b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css @@ -91,8 +91,6 @@ TODO .v-align-middle > .v-connector, .v-align-bottom > .v-connector { display: inline-block; - /* TODO this is a bit tricky, since it will override component defaults in some cases */ - white-space: normal; } .v-align-middle > .v-connector { @@ -152,8 +150,6 @@ TODO .v-caption-on-right > .v-connector { display: inline-block; vertical-align: middle; - /* TODO this is a bit tricky, since it will override component defaults in some cases */ - white-space: normal; } .v-has-caption.v-has-width > .v-connector { diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 7af440c735..71b9ad07a5 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -1,6 +1,6 @@ .v-datefield { white-space: nowrap; - float: left; /* Force minimum width */ + display: inline-block; /* Force minimum width */ } .v-datefield-textfield { vertical-align: top; diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css index 9d700fd4ee..e69de29bb2 100644 --- a/WebContent/VAADIN/themes/base/paintable/paintable.css +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -1,7 +0,0 @@ -.v-connector { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - text-align: left; - display: inline-block; -} |