royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] 02/22: fixes typo, introduces viewport in html and try to move fonts to theme, but this one doesn't work (so put in theme temporaly again)
Date Mon, 12 Mar 2018 14:32:31 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit c9b21b67fefdd030cdcb1fe401b089f8598a4e05
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Tue Mar 6 18:54:31 2018 +0100

    fixes typo, introduces viewport in html and try to move fonts to theme, but this one doesn't
work (so put in theme temporaly again)
---
 .../royale/org/apache/royale/jewel/Application.as  |  3 +-
 frameworks/themes/JewelTheme/asconfig.json         |  2 +-
 .../src/main/config/compile-swf-config.xml         | 99 ++++++++++++++++++++++
 .../JewelTheme/src/main/resources/TextButton.css   | 13 +--
 .../src/main/royale/JewelThemeClasses.as           | 19 ++++-
 5 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
index 0b447f6..fed1673 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
@@ -39,7 +39,8 @@ package org.apache.royale.jewel
          *  constructor.
          *
 		 * <inject_html>
-     	 * <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
+		 * <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1,
maximum-scale=1">
+		 * <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
      	 * </inject_html>
 	 	 * 
          *  @langversion 3.0
diff --git a/frameworks/themes/JewelTheme/asconfig.json b/frameworks/themes/JewelTheme/asconfig.json
index 2a1ae6c..1cb76c0 100644
--- a/frameworks/themes/JewelTheme/asconfig.json
+++ b/frameworks/themes/JewelTheme/asconfig.json
@@ -29,6 +29,6 @@
         "include-sources": [
             "src/main/royale"
         ],
-        "output": "target/JewelThemeClasses.swc"
+        "output": "target/JewelTheme.swc"
     }
 }
diff --git a/frameworks/themes/JewelTheme/src/main/config/compile-swf-config.xml b/frameworks/themes/JewelTheme/src/main/config/compile-swf-config.xml
new file mode 100644
index 0000000..55679c7
--- /dev/null
+++ b/frameworks/themes/JewelTheme/src/main/config/compile-swf-config.xml
@@ -0,0 +1,99 @@
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+<royale-config>
+
+    <compiler>
+        <accessible>false</accessible>
+        
+        <!-- build both SWF and JS. -->
+        <targets>
+            <target>JSRoyale</target>
+        </targets>
+        <strict-xml>true</strict-xml>
+
+        <external-library-path>
+            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+            <path-element>../../../../../libs/Binding.swc</path-element>
+            <path-element>../../../../../libs/Core.swc</path-element>
+            <path-element>../../../../../libs/Graphics.swc</path-element>
+            <path-element>../../../../../libs/Basic.swc</path-element>
+            <path-element>../../../../../libs/Collections.swc</path-element>
+            <path-element>../../../../../libs/HTML.swc</path-element>
+            <path-element>../../../../../libs/Jewel.swc</path-element>
+        </external-library-path>
+        
+        <allow-subclass-overrides>true</allow-subclass-overrides>
+		<mxml>
+			<children-as-data>true</children-as-data>
+		</mxml>
+		<binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
+		<binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
+		<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+
+        <define>
+            <name>COMPILE::SWF</name>
+            <value>true</value>
+        </define>
+        <define>
+            <name>COMPILE::JS</name>
+            <value>true</value>
+        </define>
+
+        <keep-as3-metadata>
+          <name>Bindable</name>
+          <name>Managed</name>
+          <name>ChangeEvent</name>
+          <name>NonCommittingChangeEvent</name>
+          <name>Transient</name>
+        </keep-as3-metadata>
+	  
+        <locale/>
+        
+        <library-path/>
+        
+        <source-path>
+            <path-element>../royale</path-element>
+        </source-path>
+        
+        <warn-no-constructor>false</warn-no-constructor>
+    </compiler>
+    
+    <include-file>
+        <name>defaults.css</name>
+        <path>../resources/defaults.css</path>
+    </include-file>
+    <include-file>
+        <name>TextButton.css</name>
+        <path>../resources/TextButton.css</path>
+    </include-file>
+    <include-file>
+        <name>TextField.css</name>
+        <path>../resources/TextField.css</path>
+    </include-file>
+
+    <include-lookup-only>true</include-lookup-only>
+    
+    <include-classes>
+        <class>JewelThemeClasses</class>
+    </include-classes>
+        
+    <target-player>${playerglobal.version}</target-player>
+	
+
+</royale-config>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/TextButton.css b/frameworks/themes/JewelTheme/src/main/resources/TextButton.css
index cbbfb51..6bbbaf6 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/TextButton.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/TextButton.css
@@ -28,6 +28,7 @@ TextButton, TextButton:hover {
 	
 	cursor:pointer;
 	
+	/* Background: */
 	border-image-source: url(assets/JewelButton2.svg) ;
 	border-image-slice: 4;
 	border-image-width: 4;
@@ -45,25 +46,17 @@ TextButton, TextButton:hover {
 	text-shadow: 0 1px 0 #555;
 
 	padding: 10px 32px;
-	/*line-height:16px;
-	*/
 
-	/*border-image: url(assets/JewelButton2.svg) 30 fill stretch;
-	*/
+	
 	/*background: url(assets/4slicewithpattern.svg);
 	background-size: cover;
 	width: fit-content;
-	height: fit-content;
-	*/
-	
-
-	/* Background: */
+	height: fit-content;*/
 	/*background: linear-gradient(#FF893B, #FA461E);
 	border: 1px solid #A93116;
 	border-radius: 3px;
 	box-shadow: #E6B89B 0 1px 0 inset, #E6431D 0 -1px 0 inset, #aaa 0 1px 0 inset;
 	*/
-	
 }
 
 TextButton:hover {
diff --git a/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as b/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
index 394b871..1a1733c 100644
--- a/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
+++ b/frameworks/themes/JewelTheme/src/main/royale/JewelThemeClasses.as
@@ -21,13 +21,28 @@ package
 
     /**
      *  @private
-     *  This class is used to link additional classes into jeweltheme.swc
+     *  This class is used to link additional classes into JewelTheme.swc
      *  beyond those that are found by dependecy analysis starting
      *  from the classes specified in manifest.xml.
      */
     internal class JewelThemeClasses
     {
-        
+        /**
+         *  constructor.
+         *
+		 * <inject_html>
+		 * <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
+     	 * </inject_html>
+	 	 * 
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion Royale 0.9.2
+         */
+		public function JewelThemeClasses()
+		{
+            super();
+        }
     }
 
 }
\ No newline at end of file

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

Mime
View raw message