diff options
Diffstat (limited to 'WebContent/VAADIN/themes/base')
| -rw-r--r-- | WebContent/VAADIN/themes/base/boxlayout/boxlayout.css | 21 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/button/button.css | 4 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/paintable/paintable.css | 1 |
3 files changed, 18 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css index e522989769..0ed0d40888 100644 --- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css +++ b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css @@ -6,14 +6,14 @@ TODO */ -.v-boxlayout.v-margin-top {padding-top: 18px;} -.v-boxlayout.v-margin-right {padding-right: 18px;} -.v-boxlayout.v-margin-bottom {padding-bottom: 18px;} -.v-boxlayout.v-margin-left {padding-left: 18px;} +.v-boxlayout.v-margin-top {padding-top: 12px;} +.v-boxlayout.v-margin-right {padding-right: 12px;} +.v-boxlayout.v-margin-bottom {padding-bottom: 12px;} +.v-boxlayout.v-margin-left {padding-left: 12px;} .v-spacing { - width: 7px; - height: 7px; + width: 6px; + height: 6px; } .v-boxlayout { @@ -39,6 +39,15 @@ TODO vertical-align: top; } +/* Clear any floats inside the slot, to prevent unwanted collapsing */ +.v-slot:after { + content: ""; + display: block; + clear: both; + height: 0; + overflow: hidden; +} + .v-vertical > .v-slot, .v-vertical > .v-expand > .v-slot { display: block; diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css index 2e14d59a90..8424a3e59f 100644 --- a/WebContent/VAADIN/themes/base/button/button.css +++ b/WebContent/VAADIN/themes/base/button/button.css @@ -4,7 +4,7 @@ .v-button { display: inline-block; zoom: 1; - text-align: center; + text-align: center !important; text-decoration: none; border: 2px outset #ddd; background: #eee; @@ -84,7 +84,7 @@ * NativeButton styles (html button element) * -------------------------------------- */ .v-nativebutton { - text-align: center; + text-align: center !important; cursor: pointer; white-space: nowrap; margin: 0; diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css index fbe7275113..9d700fd4ee 100644 --- a/WebContent/VAADIN/themes/base/paintable/paintable.css +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -3,4 +3,5 @@ -moz-box-sizing: border-box; box-sizing: border-box; text-align: left; + display: inline-block; } |