royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch develop updated: JewelExample using Card and new changes
Date Sun, 03 Jun 2018 13:41:20 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/develop by this push:
     new 7680c32  JewelExample using Card and new changes
7680c32 is described below

commit 7680c324881e43230d142627c68ca3a1d779e998
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Sun Jun 3 15:41:09 2018 +0200

    JewelExample using Card and new changes
---
 examples/royale/JewelExample/pom.xml                    |  2 +-
 .../src/main/resources/jewel-example-styles.css         | 11 -----------
 .../JewelExample/src/main/royale/AlertPlayGround.mxml   | 14 +++++---------
 .../JewelExample/src/main/royale/ButtonPlayGround.mxml  | 13 ++++---------
 .../src/main/royale/CheckBoxPlayGround.mxml             | 13 ++++---------
 .../src/main/royale/DropDownListPlayGround.mxml         | 11 +++++------
 .../JewelExample/src/main/royale/HeadingsAndText.mxml   | 15 ++++++---------
 .../JewelExample/src/main/royale/LabelPlayGround.mxml   | 13 ++++---------
 .../JewelExample/src/main/royale/ListPlayGround.mxml    | 17 ++++++-----------
 .../src/main/royale/RadioButtonPlayGround.mxml          | 13 ++++---------
 .../JewelExample/src/main/royale/SliderPlayGround.mxml  | 13 ++++---------
 .../src/main/royale/TextInputPlayGround.mxml            | 13 ++++---------
 .../themes/JewelTheme/src/main/resources/defaults.css   |  2 ++
 frameworks/themes/JewelTheme/src/main/sass/_global.sass |  2 ++
 14 files changed, 51 insertions(+), 101 deletions(-)

diff --git a/examples/royale/JewelExample/pom.xml b/examples/royale/JewelExample/pom.xml
index 49ad879..becaaa7 100644
--- a/examples/royale/JewelExample/pom.xml
+++ b/examples/royale/JewelExample/pom.xml
@@ -42,7 +42,7 @@
         <configuration>
           <mainClass>App.mxml</mainClass>
           <targets>JSRoyale,SWF</targets>
-          <!-- <debug>false</debug> -->
+          <debug>false</debug>
           <htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
         </configuration>
       </plugin>
diff --git a/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css b/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css
index 02b57dc..f9a01eb 100644
--- a/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css
+++ b/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css
@@ -21,15 +21,4 @@
 
 @namespace "http://www.w3.org/1999/xhtml";
 
-.Application
-{
-    padding: 10px;
-	margin: 10px;
-}
-
-/* .container {
-    background: #efefef;
-    border-radius: 10px;
-    padding: 20px;
-} */
 	
\ No newline at end of file
diff --git a/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml
index e4336d2..d01a75a 100644
--- a/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml
@@ -17,10 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-		 className="container" width="350">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html"
+		width="350">
     
 	<fx:Script>
 		<![CDATA[
@@ -45,10 +45,6 @@ limitations under the License.
             }
 		]]>
 	</fx:Script>
-
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
 	
 	<html:H3 text="Jewel Alert"/>
 	
@@ -59,4 +55,4 @@ limitations under the License.
 	<j:Button text="Click Me" click="clickHandler(event)"/>
     <j:Label id="status"/>
 	
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
index c0c373b..966925c 100644
--- a/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
@@ -17,10 +17,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-		 className="container">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html">
     
 	<fx:Script>
 		<![CDATA[      
@@ -29,10 +28,6 @@ limitations under the License.
             }
 		]]>
 	</fx:Script>
-
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
 	
 	<html:H3 text="Jewel Button"/>
 	
@@ -46,4 +41,4 @@ limitations under the License.
 			<j:Disabled/>
 		</j:beads>
 	</j:Button>
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml
index c3833ac..382ee25 100644
--- a/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/CheckBoxPlayGround.mxml
@@ -17,15 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-         className="container">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html">
     
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
-	
 	<html:H3 text="Jewel CheckBox"/>
 
 	<j:CheckBox text="Not Checkbox"/>
@@ -44,4 +39,4 @@ limitations under the License.
 		</j:beads>
 	</j:CheckBox>
 
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml
index c34de86..181a095 100644
--- a/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/DropDownListPlayGround.mxml
@@ -17,11 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:js="library://ns.apache.org/royale/basic"
-		 xmlns:html="library://ns.apache.org/royale/html"
-		 className="container">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:js="library://ns.apache.org/royale/basic"
+		xmlns:html="library://ns.apache.org/royale/html">
     
 	<fx:Script>
 		<![CDATA[      
@@ -55,4 +54,4 @@ limitations under the License.
 		</j:dataProvider>
 	</j:DropDownList> -->
 	
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml b/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml
index 77b9f17..659f25e 100644
--- a/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml
+++ b/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml
@@ -17,14 +17,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-         className="container" width="350">
-    
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html"
+		width="350">
+
 	
     <html:H3 text="Headings and text"/>
 
@@ -37,4 +34,4 @@ limitations under the License.
 	
     <j:MultilineLabel text="Normal text used in a div, texts and fields with single line
or multiple lines."/>
 
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
index 25ad5f6..0f89c12 100644
--- a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
@@ -17,10 +17,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-		 className="container">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html">
     
 	<fx:Script>
 		<![CDATA[
@@ -32,13 +31,9 @@ limitations under the License.
         }
     	]]>
 	</fx:Script>
-
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
 	
 	<html:H3 text="Jewel Label"/>
 	
 	<j:Label id="label" text="This is a Label" click="labelClick(event)"/>
 	
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml
index 6a348d6..125c293 100644
--- a/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml
@@ -17,12 +17,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:js="library://ns.apache.org/royale/basic"
-		 xmlns:html="library://ns.apache.org/royale/html"
-         xmlns:models="models.*"
-		 className="container" width="350">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:js="library://ns.apache.org/royale/basic"
+		xmlns:html="library://ns.apache.org/royale/html"
+		xmlns:models="models.*">
     
     <fx:Script>
 		<![CDATA[
@@ -55,10 +54,6 @@ limitations under the License.
         <models:ListsModel/>
 	</j:model>
 
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
-	
 	<html:H3 text="Jewel List"/>
 	
     <j:List id="list" width="200" height="300" change="onChange(event)">
@@ -73,4 +68,4 @@ limitations under the License.
 
 	<j:Button text="Assign new data" primary="true" click="assignNewData()"/>
 	
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml
index fe3309d..1ee1bc3 100644
--- a/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/RadioButtonPlayGround.mxml
@@ -17,15 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-         className="container">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html">
     
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
-	
 	<html:H3 text="Jewel RadioButton"/>
 
 	<j:RadioButton text="RadioButton 1" groupName="radios" value="Test 1"/>
@@ -44,4 +39,4 @@ limitations under the License.
 		</j:beads>
 	</j:RadioButton>
 
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
index 0d0fee5..270cf69 100644
--- a/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/SliderPlayGround.mxml
@@ -17,10 +17,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-         className="container">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html">
     
 	<fx:Script>
 		<![CDATA[
@@ -52,10 +51,6 @@ limitations under the License.
     	]]>
 	</fx:Script>
 
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
-	
 	<html:H3 text="Jewel Slider"/>
 	
 	<j:Slider id="slider_w" width="250" value="250" minimum="100" maximum="500"
@@ -76,4 +71,4 @@ limitations under the License.
 	<j:Button id="button" text="Slider to 400x200" width="250" height="80" primary="true"
 					click="clickHandler(event)"/>
 
-</j:Group>
+</j:Card>
diff --git a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
index a22fe5e..f1ceb56 100644
--- a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
@@ -17,15 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<j:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
-		 xmlns:j="library://ns.apache.org/royale/jewel"
-		 xmlns:html="library://ns.apache.org/royale/html"
-		 className="container">
+<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:j="library://ns.apache.org/royale/jewel"
+		xmlns:html="library://ns.apache.org/royale/html">
     
-	<j:beads>
-		<j:VerticalLayoutWithPaddingAndGap gap="10"/>
-	</j:beads>
-	
 	<html:H3 text="Jewel TextInput"/>
 
 	<j:Group>
@@ -62,4 +57,4 @@ limitations under the License.
 		</j:beads>
 	</j:TextInput>
 
-</j:Group>
+</j:Card>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 1490f0b..db187fb 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -20,6 +20,8 @@ j|Application {
   background: white;
   font-family: "Lato", sans-serif;
   color: #808080;
+  padding: 10px;
+  margin: 10px;
 }
 
 h1 {
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_global.sass b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
index f713728..ebf7088 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_global.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
@@ -25,6 +25,8 @@ j|Application
 	font:
 		family: $font-stack
 	color: $default-font-color
+	padding: 10px
+	margin: 10px
 
 h1
 	font-size: 2em

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

Mime
View raw message