summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBuild Agent <build@vaadin.com>2014-04-07 13:58:10 +0300
committerBuild Agent <build@vaadin.com>2014-04-07 13:58:11 +0300
commitaa309d12d53b71488b40ca04ca32d235ad39144f (patch)
tree754da080b076064cbef81b3262fd7e909138d80a
parent251de08a63f2c9fd5d398736e0a7c40da09ce85b (diff)
parent86a5f5a916747cb148ce3a2b761c0c355f867645 (diff)
downloadvaadin-framework-aa309d12d53b71488b40ca04ca32d235ad39144f.tar.gz
vaadin-framework-aa309d12d53b71488b40ca04ca32d235ad39144f.zip
Merge changes from origin/7.1
86a5f5a Selectors based on Reindeer.LAYOUT* are added for absolute layout (#11042). Change-Id: I2d607475c63e97c312a97ddd6b41d38c66a35ec6
-rw-r--r--WebContent/VAADIN/themes/reindeer/layouts/layouts.scss5
1 files changed, 4 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
index fb47c100f8..0b0b311daa 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
@@ -42,6 +42,7 @@
.v-gridlayout-blue,
.v-csslayout-blue,
.v-formlayout-blue,
+.v-absolutelayout-blue,
.v-splitpanel-vertical-blue,
.v-splitpanel-horizontal-blue {
background-color: #bcd3de;
@@ -56,6 +57,7 @@
.v-gridlayout-white,
.v-csslayout-white,
.v-formlayout-white,
+.v-absolutelayout-white,
.v-splitpanel-vertical-white,
.v-splitpanel-horizontal-white {
background-color: #fff;
@@ -72,6 +74,7 @@
.v-gridlayout-black,
.v-csslayout-black,
.v-formlayout-black,
+.v-absolutelayout-black,
.v-splitpanel-vertical-black,
.v-splitpanel-horizontal-black {
background: #1e2022 url(img/black-bg.png) repeat-x;
@@ -80,4 +83,4 @@
background: #1e2022 url(img/black-bg.png) repeat-x;
}
-} \ No newline at end of file
+}