royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch feature/vivid-ui-set updated: include assets in theme swc
Date Sat, 24 Feb 2018 18:51:37 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/feature/vivid-ui-set by this push:
     new 6da6fb8  include assets in theme swc
6da6fb8 is described below

commit 6da6fb887527e68c8d7a9367b8f7fdb785785da5
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Sat Feb 24 19:51:33 2018 +0100

    include assets in theme swc
---
 examples/royale/VividExample/pom.xml                          |  6 ------
 frameworks/themes/VividBlueTheme/pom.xml                      |  4 ++++
 .../themes/VividBlueTheme/src/main/resources/TextButton.css   | 11 +++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/examples/royale/VividExample/pom.xml b/examples/royale/VividExample/pom.xml
index c6210af..bec6b75 100644
--- a/examples/royale/VividExample/pom.xml
+++ b/examples/royale/VividExample/pom.xml
@@ -34,12 +34,6 @@
 
   <build>
     <sourceDirectory>src/main/royale</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.royale.compiler</groupId>
diff --git a/frameworks/themes/VividBlueTheme/pom.xml b/frameworks/themes/VividBlueTheme/pom.xml
index e0cc7cb..c039af6 100644
--- a/frameworks/themes/VividBlueTheme/pom.xml
+++ b/frameworks/themes/VividBlueTheme/pom.xml
@@ -46,6 +46,10 @@
           </includeClasses>
           <includeFiles>
             <include-file>
+              <name>assets/*</name>
+              <path>../src/main/resources/assets/*</path>
+            </include-file>
+            <include-file>
               <name>defaults.css</name>
               <path>../src/main/resources/defaults.css</path>
             </include-file>
diff --git a/frameworks/themes/VividBlueTheme/src/main/resources/TextButton.css b/frameworks/themes/VividBlueTheme/src/main/resources/TextButton.css
index 8e688fc..20f3bef 100644
--- a/frameworks/themes/VividBlueTheme/src/main/resources/TextButton.css
+++ b/frameworks/themes/VividBlueTheme/src/main/resources/TextButton.css
@@ -27,8 +27,7 @@
 TextButton {
 	/* Background: */
 	background: url(assets/buttonbackground.svg) no-repeat top left;
-	  background-size: contain;
-	  border: none;
+	background-size: contain;
 	
 	/*background-color: #D8D8D8;
 	border: 1px solid #979797;
@@ -45,13 +44,13 @@ TextButton {
 }*/
 
 TextButton:hover {
-    background-color: #CFCFCF;
+    /*background-color: #CFCFCF;
     vertical-align: middle;
     border: none;
-    border-radius: 6px;
+    border-radius: 6px;*/
 }
 
 TextButton:active {
-    background-color: #77CEFF;
-    color: #FFFFFF;
+    /*background-color: #77CEFF;
+    color: #FFFFFF;*/
 }
\ No newline at end of file

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

Mime
View raw message