diff options
| author | Marko Gronroos <magi@vaadin.com> | 2012-09-07 15:29:22 +0300 |
|---|---|---|
| committer | Marko Gronroos <magi@vaadin.com> | 2012-09-07 15:29:22 +0300 |
| commit | 733a7fd89068939b44f357e9eb88e197427097da (patch) | |
| tree | c4df6d3265ae84aeac32ebcc5ff56f7be1336fde /WebContent | |
| parent | 49d3a1124fc827ffbddcb8b1d00f7707a50a1e89 (diff) | |
| parent | 9f6bceab2861e4d5a8bccca6c2283804def6477c (diff) | |
| download | vaadin-framework-733a7fd89068939b44f357e9eb88e197427097da.tar.gz vaadin-framework-733a7fd89068939b44f357e9eb88e197427097da.zip | |
Merge branch 'master' of ssh://dev.vaadin.com/vaadin
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 (renamed from WebContent/VAADIN/themes/base/paintable/paintable.scss) | 3 |
3 files changed, 4 insertions, 3 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/paintable/paintable.scss b/WebContent/VAADIN/themes/base/widget/widget.scss index 2dab62f558..215c276142 100644 --- a/WebContent/VAADIN/themes/base/paintable/paintable.scss +++ b/WebContent/VAADIN/themes/base/widget/widget.scss @@ -1,4 +1,4 @@ -@mixin base-paintable { +@mixin base-widget { .v-widget { -webkit-box-sizing: border-box; @@ -7,6 +7,7 @@ text-align: left; display: inline-block; white-space: normal; + vertical-align: top; } }
\ No newline at end of file |