summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/reindeer/tabsheet
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-08-08 14:27:31 +0300
committerHenri Sara <hesara@vaadin.com>2012-08-08 14:44:49 +0300
commitcfa455d6cfd4a535fd77cbc76637a57e7024e9ac (patch)
treececb66492671ed20fa9865581da12930ed502047 /WebContent/VAADIN/themes/reindeer/tabsheet
parent620e096b45f27ecc5aa85d164ca8b81df000e593 (diff)
downloadvaadin-framework-cfa455d6cfd4a535fd77cbc76637a57e7024e9ac.tar.gz
vaadin-framework-cfa455d6cfd4a535fd77cbc76637a57e7024e9ac.zip
Standard themes in SCSS form, updated CompileDefaultTheme (#9223)
Conversion performed for most themes trivial, just rename file and wrap in a mixin. For chameleon compounds, also nesting used. In some cases, related small files combined in a single SCSS file Chameleon accordion and select contain fixes other than just a missing semicolon.
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/tabsheet')
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss (renamed from WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.css)4
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss (renamed from WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.css)4
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss (renamed from WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css)4
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss (renamed from WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css)4
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss (renamed from WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css)4
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss (renamed from WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.css)4
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss (renamed from WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css)4
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css8
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.scss20
9 files changed, 48 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
index e9325404da..1efdab68af 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-tabsheet-borderless-style {
+
.v-tabsheet-borderless .v-tabsheet-tabitemcell-first {
padding-left: 7px;
background: url(img/framed/tab-first-left.png) no-repeat -3px 0;
@@ -17,4 +19,6 @@
.v-tabsheet-borderless .v-tabsheet-deco {
height: 0;
border-top: none;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
index 40b75c59b3..dda381b1b0 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
@@ -1,6 +1,10 @@
+@mixin reindeer-tabsheet-hover-closable-style {
+
.v-tabsheet-tabs-hover-closable .v-tabsheet-caption-close {
visibility: hidden;
}
.v-tabsheet-tabs-hover-closable .v-tabsheet-tabitem:hover .v-tabsheet-caption-close {
visibility: visible;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
index dfa83d7088..608aae55cb 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-tabsheet-minimal-style {
+
/**
* Tabsheet "minimal" style --------------
*/
@@ -142,4 +144,6 @@
}
.black .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:active {
background: #626669;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
index 3d23fa110a..11bb98536a 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-tabsheet-normal-style {
+
/* Default Tabsheet styles */
.v-tabsheet-tabitemcell,
@@ -149,4 +151,6 @@
.v-ie8 .v-tabsheet-tabs .v-errorindicator,
.v-ie9 .v-tabsheet-tabs .v-errorindicator {
display: inline-block;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
index 18ad5c9194..8f176e2150 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-tabsheet-scroller {
+
/* Tabsheet scroller styles */
.v-tabsheet-scroller {
@@ -48,4 +50,6 @@
background-image: url(img/tab-next-disabled.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */
opacity: 1;
filter: none;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
index e4b8e0cd5f..d26a569c25 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-tabsheet-selected-closable-style {
+
.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem .v-tabsheet-caption-close,
.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem:hover .v-tabsheet-caption-close {
visibility: hidden;
@@ -5,4 +7,6 @@
.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem-selected .v-tabsheet-caption-close,
.v-tabsheet-tabs-selected-closable .v-tabsheet-tabitem-selected:hover .v-tabsheet-caption-close {
visibility: visible;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
index c7c79d35ee..e4f098046c 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-tabsheet-small-style {
+
/**
* Tabsheet bar style ---------------
*/
@@ -107,3 +109,5 @@
border: none;
}
/* Content area font color specified with minimal style (reduces additional selectors) */
+
+} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
deleted file mode 100644
index b636effb0f..0000000000
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* These styles get catenated together on build */
-@import "tabsheet-normal-style.css";
-@import "tabsheet-scroller.css";
-@import "tabsheet-borderless-style.css";
-@import "tabsheet-minimal-style.css";
-@import "tabsheet-small-style.css";
-@import "tabsheet-selected-closable-style.css";
-@import "tabsheet-hover-closable-style.css"; \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
new file mode 100644
index 0000000000..8b9252cf68
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
@@ -0,0 +1,20 @@
+/* These styles get catenated together on build */
+@import "tabsheet-normal-style.scss";
+@import "tabsheet-scroller.scss";
+@import "tabsheet-borderless-style.scss";
+@import "tabsheet-minimal-style.scss";
+@import "tabsheet-small-style.scss";
+@import "tabsheet-selected-closable-style.scss";
+@import "tabsheet-hover-closable-style.scss";
+
+@mixin reindeer-tabsheet {
+
+ @include reindeer-tabsheet-normal-style;
+ @include reindeer-tabsheet-scroller;
+ @include reindeer-tabsheet-borderless-style;
+ @include reindeer-tabsheet-minimal-style;
+ @include reindeer-tabsheet-small-style;
+ @include reindeer-tabsheet-selected-closable-style;
+ @include reindeer-tabsheet-hover-closable-style;
+
+}