diff options
author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-02 14:35:38 +0300 |
---|---|---|
committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-04 06:58:45 +0000 |
commit | faaa02e1937f88c184ce4e88a548c9348de8f375 (patch) | |
tree | eeceb60b3ca58b43a2b42f932f22566521c19b53 /WebContent/VAADIN/themes/valo/shared/_global.scss | |
parent | 3a234228a3df575ce49b90368f966e6458fee757 (diff) | |
download | vaadin-framework-faaa02e1937f88c184ce4e88a548c9348de8f375.tar.gz vaadin-framework-faaa02e1937f88c184ce4e88a548c9348de8f375.zip |
Valo Sass API refactoring (#13668)
Also fixes #13672 (added ‘notification’ v-included-components list)
Fixes #13746 as well (DragAndDropWrapper won’t hide the drag source any
more)
Loads of smaller tweaks and fixes, went through almost all components
again and fixed any issues I could find in testing.
Testing done with the following:
Desktop (OS X Mavericks)
-Safari 7
-Chrome 35
-Firefox 24.5
-Opera 21, 12
-Internet Explorer 8,10
Mobile:
-iOS 7
-Android 4
-Android 2.3
-Windows Phone 8
Change-Id: Ide32cacd1958b5b8db85afe23f455ad3140a7d21
Diffstat (limited to 'WebContent/VAADIN/themes/valo/shared/_global.scss')
-rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_global.scss | 66 |
1 files changed, 39 insertions, 27 deletions
diff --git a/WebContent/VAADIN/themes/valo/shared/_global.scss b/WebContent/VAADIN/themes/valo/shared/_global.scss index e685c7fc01..2c71f076e2 100644 --- a/WebContent/VAADIN/themes/valo/shared/_global.scss +++ b/WebContent/VAADIN/themes/valo/shared/_global.scss @@ -88,6 +88,10 @@ $valo-global-included: false !default; overflow: hidden; } + .v-icon { + cursor: inherit; + } + .v-icon, .v-errorindicator, .v-required-field-indicator { @@ -95,19 +99,45 @@ $valo-global-included: false !default; line-height: inherit; } - .v-caption, - .v-captiontext { + .v-caption { display: inline-block; + white-space: nowrap; line-height: $v-line-height; } + .v-captiontext { + display: inline-block; + line-height: inherit; + } + // Component global styles should also be included here - @include valo-orderedlayout-global; - @include valo-gridlayout-global; - @include valo-calendar-global; - @include valo-colorpicker-global; - @include valo-table-global; - @include valo-tabsheet-global; + @if v-is-included(orderedlayout) { + @include valo-orderedlayout-global; + } + + @if v-is-included(gridlayout) { + @include valo-gridlayout-global; + } + + @if v-is-included(calendar) { + @include valo-calendar-global; + } + + @if v-is-included(colorpicker) { + @include valo-colorpicker-global; + } + + @if v-is-included(table) or v-is-included(treetable) { + @include valo-table-global; + } + + @if v-is-included(tabsheet) { + @include valo-tabsheet-global; + } + + @if v-is-included(splitpanel) { + @include valo-splitpanel-global; + } $valo-global-included: true; } @@ -225,9 +255,6 @@ $valo-shared-pathPrefix: null; outline: none; } - //.v-captiontext, - //.v-errorindicator, - //.v-required-field-indicator, img.v-icon { vertical-align: middle; } @@ -340,6 +367,7 @@ $valo-shared-pathPrefix: null; .v-generated-body { height: auto; overflow: auto; + background-color: $v-app-background-color; } .v-app, @@ -349,20 +377,4 @@ $valo-shared-pathPrefix: null; overflow: visible !important; } - // Reposition loading indicator so that it doens't scroll with the page - .v-loading-indicator { - position: fixed !important; - } - - .v-overlay-container { - position: absolute; - top: 0; - left: 0; - } - - // Reposition notifications so that they don't scroll with the page - .v-Notification { - position: fixed !important; - } - } |