From a8b35f5d13b23d891f02f42a452f7930875cdb6a Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 14 Jan 2016 20:47:45 +0200
Subject: Correctly include base theme for font support (#19470)

Change-Id: Icc8c3c2c1acfeb9b968085a28d087eb62ae6d467
---
 widgets/build.xml                          | 6 +++---
 widgets/src/com/vaadin/themes/Valo.gwt.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'widgets')

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>
-- 
cgit v1.2.3