summaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-30 15:22:01 +0300
committerVaadin Code Review <review@vaadin.com>2016-03-30 14:06:20 +0000
commit664d818e4de39485d3271bad59d03611ec158664 (patch)
treee2d26f05efd53b9817d17f86159795ce3c5a7899 /themes
parent595502eb723be5d233a336546370a7fb6243ad28 (diff)
downloadvaadin-framework-664d818e4de39485d3271bad59d03611ec158664.tar.gz
vaadin-framework-664d818e4de39485d3271bad59d03611ec158664.zip
Filter valo/shared/_global.scss theme file
Change-Id: Icc1e1a0c8482117f38d5e1110a65580fb26d49ba
Diffstat (limited to 'themes')
-rw-r--r--themes/pom.xml2
-rw-r--r--themes/src/main/resources/VAADIN/themes/valo/shared/_global.scss2
2 files changed, 3 insertions, 1 deletions
diff --git a/themes/pom.xml b/themes/pom.xml
index 0b11b4ac1b..ce28a5fac2 100644
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -63,6 +63,7 @@
<filtering>false</filtering>
<excludes>
<exclude>**/base.scss</exclude>
+ <exclude>**/valo/shared/_global.scss</exclude>
</excludes>
</resource>
<resource>
@@ -70,6 +71,7 @@
<filtering>true</filtering>
<includes>
<include>**/base.scss</include>
+ <include>**/valo/shared/_global.scss</include>
</includes>
</resource>
</resources>
diff --git a/themes/src/main/resources/VAADIN/themes/valo/shared/_global.scss b/themes/src/main/resources/VAADIN/themes/valo/shared/_global.scss
index 39b5a4e7d9..55de987120 100644
--- a/themes/src/main/resources/VAADIN/themes/valo/shared/_global.scss
+++ b/themes/src/main/resources/VAADIN/themes/valo/shared/_global.scss
@@ -26,7 +26,7 @@ $valo-global-included: false !default;
// Version info for the debug window
.v-vaadin-version:after {
- content: "@version@";
+ content: "${project.version}";
}
// Core widget styles come before any other component (and are always included),