diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2012-09-07 14:52:10 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2012-09-07 14:52:10 +0300 |
| commit | 0164805d8a517ff85cab8c3a393e06f3702b0c49 (patch) | |
| tree | 9be8da7e01d377f48bf2563e8be502459867e3ed /WebContent | |
| parent | 7cf781eaf62f145d96a562c945232c32c74df263 (diff) | |
| download | vaadin-framework-0164805d8a517ff85cab8c3a393e06f3702b0c49.tar.gz vaadin-framework-0164805d8a517ff85cab8c3a393e06f3702b0c49.zip | |
Fixed 5px gaps between vertical layout slots (Firefox/Opera) after doctype was changed to HTML5 (#8294). Refactored paintable.scss to widget.scss (this time for real)
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/styles.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/widget/widget.scss | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 915da19226..dae1d0eef3 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -18,7 +18,6 @@ @import "menubar/menubar.scss"; @import "notification/notification.scss"; @import "orderedlayout/orderedlayout.scss"; -@import "paintable/paintable.scss"; @import "panel/panel.scss"; @import "popupview/popupview.scss"; @import "progressindicator/progressindicator.scss"; @@ -32,4 +31,5 @@ @import "tree/tree.scss"; @import "treetable/treetable.scss"; @import "upload/upload.scss"; +@import "widget/widget.scss"; @import "window/window.scss"; diff --git a/WebContent/VAADIN/themes/base/styles.scss b/WebContent/VAADIN/themes/base/styles.scss index ed37d3cc80..7ca27280bc 100644 --- a/WebContent/VAADIN/themes/base/styles.scss +++ b/WebContent/VAADIN/themes/base/styles.scss @@ -5,7 +5,7 @@ // everything included from base theme // other themes should enclose corresponding definitions in theme selectors -@include base-paintable; +@include base-widget; @include base-absolutelayout; @include base-accordion; diff --git a/WebContent/VAADIN/themes/base/widget/widget.scss b/WebContent/VAADIN/themes/base/widget/widget.scss new file mode 100644 index 0000000000..215c276142 --- /dev/null +++ b/WebContent/VAADIN/themes/base/widget/widget.scss @@ -0,0 +1,13 @@ +@mixin base-widget { + +.v-widget { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + text-align: left; + display: inline-block; + white-space: normal; + vertical-align: top; +} + +}
\ No newline at end of file |