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: fix jewel list to work with flexbox
Date Mon, 04 Jun 2018 09:42:00 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 f6fcd5a  fix jewel list to work with flexbox
f6fcd5a is described below

commit f6fcd5ae2752fcda368eaa638e964601b08a106b
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Mon Jun 4 11:41:56 2018 +0200

    fix jewel list to work with flexbox
---
 .../projects/Jewel/src/main/resources/defaults.css       | 16 ++++++++++------
 frameworks/projects/Jewel/src/main/sass/_global.sass     |  8 ++++----
 .../Jewel/src/main/sass/components/_itemRenderer.sass    |  6 ++++--
 .../projects/Jewel/src/main/sass/components/_list.sass   |  5 ++++-
 .../themes/JewelTheme/src/main/resources/defaults.css    |  3 ---
 .../src/main/sass/components-primary/_itemRenderer.sass  |  4 ----
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 68fb090..dbc88ff 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -28,17 +28,11 @@ j|Application *, .royale *, .royale *:before, .royale *:after {
   flex-flow: row nowrap;
   align-items: flex-start;
 }
-.layout.horizontal > * {
-  flex: 1 0 auto;
-}
 
 .layout.vertical {
   flex-flow: column nowrap;
   align-items: flex-start;
 }
-.layout.vertical > * {
-  flex: 1 0 auto;
-}
 
 .layout.horizontal.space {
   justify-content: space-between;
@@ -164,6 +158,11 @@ j|ControlBar {
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
   }
 }
+.jewel.item {
+  display: flex;
+  cursor: pointer;
+}
+
 j|ListItemRenderer {
   IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController");
 }
@@ -181,6 +180,11 @@ j|Label {
   IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.TextModel");
 }
 
+.jewel.list {
+  align-items: stretch;
+  align-content: flex-start;
+}
+
 j|List {
   IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ListView");
   IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController");
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index cd3470f..a9da4ae 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -45,15 +45,15 @@ j|Application *, .royale *, .royale *:before, .royale *:after
 	flex-flow: row nowrap
 	//justify-content: flex-start // align main axis (default)
 	align-items: flex-start
-	> *
-		flex: 1 0 auto
+	//> *
+	//	flex: 1 0 auto
 	
 .layout.vertical
 	flex-flow: column nowrap
 	//justify-content: flex-start // align main axis (default)
 	align-items: flex-start
-	> *
-		flex: 1 0 auto
+	//> *
+	//	flex: 1 0 auto
 	
 .layout.horizontal.space
 	justify-content: space-between
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
index 2f113dd..ac95f2a 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
@@ -20,7 +20,9 @@
 // Jewel ListItemRenderer
 
 // ListItemRenderer variables
-
-
+.jewel.item
+    display: flex
+    cursor: pointer
+    
 j|ListItemRenderer
     IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
index a54f92c..6ac43d2 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
@@ -18,9 +18,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Jewel List
-
 // List variables
 
+.jewel.list
+    align-items: stretch
+    align-content: flex-start
+    
 j|List
     IBeadView:  ClassReference("org.apache.royale.jewel.beads.views.ListView")
     IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController")
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index db187fb..0663ee5 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -323,10 +323,7 @@ j|Card {
 }
 
 .jewel.item {
-  cursor: pointer;
   padding: 8px;
-  flex-shrink: 0;
-  flex-grow: 1;
 }
 .jewel.item:hover {
   color: #FFFFFF;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
index 5934026..c2117b8 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
@@ -21,12 +21,8 @@
 
 // ListItemRenderer variables
 .jewel.item
-    cursor: pointer
     padding: 8px
     
-    flex-shrink: 0
-    flex-grow: 1
-
     &:hover
         color: $font-theme-color
         background: $primary-color

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

Mime
View raw message