From 90f66298c0c7179b22ebe4f78c95eba7fc432f4d Mon Sep 17 00:00:00 2001 From: Dmitrii Rogozin Date: Tue, 24 Jun 2014 15:29:40 +0300 Subject: Disabled shadow divs. Instead use css box-shadow (#13885) Change-Id: Ibf8888de795b08aed0446607165d7318f94ee6f4 --- WebContent/VAADIN/themes/base/common/common.scss | 14 ++++++++++++++ WebContent/VAADIN/themes/base/shadow/shadow.scss | 6 ++++++ WebContent/VAADIN/themes/base/window/window.scss | 6 ++++++ 3 files changed, 26 insertions(+) (limited to 'WebContent/VAADIN/themes/base') diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 6ec85e3c6d..0a493e0356 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -11,6 +11,19 @@ .v-caption { cursor: default; } +/* add box-shadows to overlay elements */ +.v-window { + box-shadow: 0 5px 18px 0 rgba(0, 0, 0, .5); +} +.v-datefield-popup, +.v-filterselect-suggestpopup, +.v-menubar-popup, +.v-slider-feedback, +.v-popupview-popup, +.v-contextmenu { + box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .5); +} + body &.v-app .v-app-loading { /* You can use this to provide indication for the user that the application is loading. */ /* It is applied to the same element as .v-app */ @@ -115,6 +128,7 @@ body &.v-app .v-app-loading { .v-tooltip { cursor: default; background: #fff; + box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .5); } .v-tooltip-text { overflow: auto; diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.scss b/WebContent/VAADIN/themes/base/shadow/shadow.scss index 47bf4acfde..3c369d3fef 100644 --- a/WebContent/VAADIN/themes/base/shadow/shadow.scss +++ b/WebContent/VAADIN/themes/base/shadow/shadow.scss @@ -2,6 +2,12 @@ .#{$primaryStyleName} { position: absolute; + display: none; + pointer-events: none; + + .v-ie8 & { + display: block; + } } .#{$primaryStyleName} .top-left { diff --git a/WebContent/VAADIN/themes/base/window/window.scss b/WebContent/VAADIN/themes/base/window/window.scss index 05f3b115ad..4e414379cf 100644 --- a/WebContent/VAADIN/themes/base/window/window.scss +++ b/WebContent/VAADIN/themes/base/window/window.scss @@ -125,6 +125,12 @@ div.#{$primaryStyleName}-header { /* Shadow for window */ .v-shadow-window { position: absolute; + display: none; + pointer-events: none; + + .v-ie8 & { + display: block; + } } .v-shadow-window .top-left { position: absolute; overflow: hidden; -- cgit v1.2.3 From 8c36375edb9cadfec64a67f034d2a6828242df6f Mon Sep 17 00:00:00 2001 From: Dmitrii Rogozin Date: Fri, 4 Jul 2014 15:46:55 +0300 Subject: Fix background color in chameleon theme after removing shadow divs (#14145) Change-Id: I9b0566070af58afda7693936943237e70cea4a2f --- WebContent/VAADIN/themes/base/datefield/datefield.scss | 3 +++ WebContent/VAADIN/themes/chameleon/common/common.scss | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'WebContent/VAADIN/themes/base') diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.scss b/WebContent/VAADIN/themes/base/datefield/datefield.scss index d094235c0f..57a691211d 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.scss +++ b/WebContent/VAADIN/themes/base/datefield/datefield.scss @@ -95,6 +95,9 @@ } .#{$primaryStyleName}-popup { background: #fff; + .v-ie9 &, .v-ie10 &, .v-ie11 & { + box-shadow: 0 2px 10px 0 rgba(0, 0, 0, .5); + } } .#{$primaryStyleName}-popupcalendar input.#{$primaryStyleName}-textfield { -webkit-box-sizing: border-box; diff --git a/WebContent/VAADIN/themes/chameleon/common/common.scss b/WebContent/VAADIN/themes/chameleon/common/common.scss index b8233fc53b..7bee2f529c 100644 --- a/WebContent/VAADIN/themes/chameleon/common/common.scss +++ b/WebContent/VAADIN/themes/chameleon/common/common.scss @@ -91,8 +91,6 @@ $chameleon-line-height: 1.4; .v-contextmenu, .v-Notification, .v-menubar-submenu { - background: #fff url(../img/grad-light-top.png) repeat-x; - background-color: rgba(255,255,255,.85); border: 1px solid #adadad; border-color: rgba(0,0,0,.4); border-radius: 4px; @@ -100,7 +98,14 @@ $chameleon-line-height: 1.4; -moz-border-radius: 4px; overflow: hidden; } - + .v-window, + .v-popupview-popup, + .v-filterselect-suggestpopup, + .v-datefield-popup, + .v-contextmenu, + .v-menubar-submenu{ + background: rgba(232,232,232,.90) url(../img/grad-light-top.png) repeat-x; + } .v-filterselect-suggestpopup, .v-contextmenu, .v-menubar-submenu { -- cgit v1.2.3