aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-01-14 20:47:45 +0200
committerArtur Signell <artur@vaadin.com>2016-01-14 21:18:22 +0200
commit50690c3af6c816461b54719efc0a4f7cf9fd4d5f (patch)
tree085934fdbb4c8d83364d1e786750d25d2c47b2d1
parent1549f1437c0b6ee99dd35f9b556c6c4670410873 (diff)
downloadvaadin-framework-50690c3af6c816461b54719efc0a4f7cf9fd4d5f.tar.gz
vaadin-framework-50690c3af6c816461b54719efc0a4f7cf9fd4d5f.zip
Correctly include base theme for font support (#19470)
Change-Id: I2cb5ddd8d2d8421793c258994f3bb930f4488273
-rw-r--r--widgets/build.xml6
-rw-r--r--widgets/src/com/vaadin/themes/Valo.gwt.xml4
2 files changed, 5 insertions, 5 deletions
diff --git a/widgets/build.xml b/widgets/build.xml
index a2eebd4276..2b1f30f7cb 100644
--- a/widgets/build.xml
+++ b/widgets/build.xml
@@ -76,11 +76,11 @@
</fileset>
</copy>
- <mkdir dir="${result.src}/com/vaadin/themes" />
- <copy todir="${result.src}/com/vaadin/themes/valo">
+ <mkdir dir="${result.src}/com/vaadin/themes/public" />
+ <copy todir="${result.src}/com/vaadin/themes/public/valo">
<fileset dir="${result.deps}/VAADIN/themes/valo" />
</copy>
- <copy todir="${result.src}/com/vaadin/themes/base">
+ <copy todir="${result.src}/com/vaadin/themes/public/base">
<fileset dir="${result.deps}/VAADIN/themes/base" />
</copy>
</target>
diff --git a/widgets/src/com/vaadin/themes/Valo.gwt.xml b/widgets/src/com/vaadin/themes/Valo.gwt.xml
index 7c58d61ecf..d9e0f6ab73 100644
--- a/widgets/src/com/vaadin/themes/Valo.gwt.xml
+++ b/widgets/src/com/vaadin/themes/Valo.gwt.xml
@@ -4,6 +4,6 @@
<module>
<entry-point class='com.vaadin.themes.valoutil.BodyStyleName' />
<source path='valoutil' />
- <public path="valo" />
- <stylesheet src="styles.css" />
+ <public path="public" />
+ <stylesheet src="valo/styles.css" />
</module>