summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-05-28 19:52:21 +0300
committerVaadin Code Review <review@vaadin.com>2013-05-29 13:42:04 +0000
commita5b8209d928815aab9eee2151bdd00686a2b0ff7 (patch)
tree8a0cd2d8bbe50dbdeb156b64af0c3883df5622a7 /WebContent
parent91182e237f2f4f8784582887970c32b5be3ad7c5 (diff)
downloadvaadin-framework-a5b8209d928815aab9eee2151bdd00686a2b0ff7.tar.gz
vaadin-framework-a5b8209d928815aab9eee2151bdd00686a2b0ff7.zip
Add primary style name support for ProgressBar/Indicator (#9913)
Change-Id: I3d773640d2f1c8cd1b71c673685afd7059811d16
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/base.scss5
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/components.scss6
-rw-r--r--WebContent/VAADIN/themes/liferay/liferay.scss4
-rw-r--r--WebContent/VAADIN/themes/reindeer/reindeer.scss5
-rw-r--r--WebContent/VAADIN/themes/runo/runo.scss6
5 files changed, 21 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index 83e463fa00..514579830d 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -88,7 +88,10 @@ $line-height: normal;
@include base-orderedlayout;
@include base-panel;
@include base-popupview;
- @include base-progressindicator;
+ @include base-progressindicator(v-progressbar);
+ /* For legacy ProgressIndicator component */
+ @include base-progressindicator(v-progressindicator);
+
@include base-select;
@include base-shadow;
@include base-slider;
diff --git a/WebContent/VAADIN/themes/chameleon/components/components.scss b/WebContent/VAADIN/themes/chameleon/components/components.scss
index 9f29827de0..9c8a56b33d 100644
--- a/WebContent/VAADIN/themes/chameleon/components/components.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/components.scss
@@ -29,7 +29,11 @@
@include chameleon-notification;
@include chameleon-panel;
@include chameleon-popupview;
- @include chameleon-progressindicator;
+
+ @include chameleon-progressindicator(v-progressbar);
+ /* For legacy ProgressIndicator component */
+ @include chameleon-progressindicator(v-progressindicator);
+
@include chameleon-slider;
@include chameleon-splitpanel;
@include chameleon-table;
diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss
index 7d7665ad86..273c065772 100644
--- a/WebContent/VAADIN/themes/liferay/liferay.scss
+++ b/WebContent/VAADIN/themes/liferay/liferay.scss
@@ -42,7 +42,9 @@
@include liferay-notification;
@include liferay-panel;
@include liferay-popupview;
- @include liferay-progressindicator;
+ @include liferay-progressindicator(v-progressbar);
+ /* For legacy ProgressIndicator component */
+ @include liferay-progressindicator(v-progressindicator);
@include liferay-select;
@include liferay-slider;
@include liferay-splitpanel;
diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index 3cf1c392e3..485839ecc7 100644
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -56,7 +56,10 @@ $line-height: normal;
@include reindeer-notification;
@include reindeer-panel;
@include reindeer-popupview;
- @include reindeer-progressindicator;
+ @include reindeer-progressindicator(v-progressbar);
+ /* For legacy ProgressIndicator component */
+ @include reindeer-progressindicator(v-progressindicator);
+
@include reindeer-select;
@include reindeer-slider;
@include reindeer-splitpanel;
diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss
index 6e88b14eb4..33ad35a8af 100644
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/WebContent/VAADIN/themes/runo/runo.scss
@@ -58,7 +58,11 @@ $line-height: 18px;
@include runo-orderedlayout;
@include runo-panel;
@include runo-popupview;
- @include runo-progressindicator;
+
+ @include runo-progressindicator(v-progressbar);
+ /* For legacy ProgressIndicator component */
+ @include runo-progressindicator(v-progressindicator);
+
@include runo-select;
@include runo-shadow;
@include runo-slider;