royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] 22/22: fix classreference compilation with themes in pom.xml
Date Fri, 16 Mar 2018 17:41:21 GMT
This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 8cca2267d95063339b93aee091a4218ca34ffec2
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Fri Mar 16 18:39:42 2018 +0100

    fix classreference compilation with themes in pom.xml
---
 examples/royale/JewelExample/pom.xml               | 23 ++++++++++++++++++++++
 .../JewelTheme/src/main/resources/defaults.css     |  1 +
 .../src/main/sass/components/_label.sass           |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/examples/royale/JewelExample/pom.xml b/examples/royale/JewelExample/pom.xml
index 19f1837..5427bc4 100644
--- a/examples/royale/JewelExample/pom.xml
+++ b/examples/royale/JewelExample/pom.xml
@@ -81,6 +81,13 @@
       <artifactId>Basic</artifactId>
       <version>0.9.3-SNAPSHOT</version>
       <type>swc</type>
+      <classifier>swf</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>Basic</artifactId>
+      <version>0.9.3-SNAPSHOT</version>
+      <type>swc</type>
       <classifier>js</classifier>
     </dependency>
     <dependency>
@@ -92,10 +99,26 @@
     </dependency>
     <dependency>
       <groupId>org.apache.royale.framework</groupId>
+      <artifactId>HTML</artifactId>
+      <version>0.9.3-SNAPSHOT</version>
+      <type>swc</type>
+      <classifier>js</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
       <artifactId>JewelTheme</artifactId>
       <version>0.9.3-SNAPSHOT</version>
       <type>swc</type>
       <scope>theme</scope>
+      <classifier>swf</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.royale.framework</groupId>
+      <artifactId>JewelTheme</artifactId>
+      <version>0.9.3-SNAPSHOT</version>
+      <type>swc</type>
+      <scope>theme</scope>
+      <classifier>js</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.royale.framework</groupId>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 714ec69..9022239 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -221,6 +221,7 @@
  * Jewel Label
  */
 .jewel.label {
+  IBeadView: ClassReference("org.apache.royale.beads.views.LabelViewBead");
   font-family: "Lato", sans-serif;
   font-size: 0.75rem;
 }
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
index bb933f8..27906d1 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass
@@ -22,7 +22,7 @@
  */
 .jewel.label
 	//IBeadView: ClassReference("org.apache.royale.html.beads.TextFieldView")
-	//IBeadView: ClassReference("org.apache.royale.beads.views.LabelViewBead")
+	IBeadView: ClassReference("org.apache.royale.beads.views.LabelViewBead")
 	font:
 		family: $font-stack
 		size: $font-size
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.

Mime
View raw message