[royale-asjs] branch develop updated: fix renderers not able to expand in height when in phone or tablet screens if they have a height greater than the one defined in the styles

[ca...@apache.org]

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 0ca101c  fix renderers not able to expand in height when in phone or tablet screens if they have a height greater than the one defined in the styles
0ca101c is described below

commit 0ca101c5254324717279d9357dadff26e7847307
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Jan 24 20:25:03 2019 +0100

    fix renderers not able to expand in height when in phone or tablet screens if they have a height greater than the one defined in the styles
---
 frameworks/projects/Jewel/src/main/resources/defaults.css         | 4 ++--
 .../org/apache/royale/jewel/itemRenderers/StringItemRenderer.as   | 8 ++++----
 frameworks/projects/Jewel/src/main/sass/components/_combobox.sass | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 7e36e56..6134d9a 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -416,7 +416,7 @@ j|ComboBox {
   }
 
   .jewel.item {
-    height: 48px !important;
+    min-height: 48px !important;
   }
 }
 @media (min-width: 992px) {
@@ -439,7 +439,7 @@ j|ComboBox {
     left: auto;
   }
   .combobox-popup.open .jewel.list .jewel.item {
-    height: 34px;
+    min-height: 34px;
   }
 }
 j|ComboBoxPopUp {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
index 9b6ea04..145e196 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
@@ -18,7 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.itemRenderers
 {
-    import org.apache.royale.html.supportClasses.DataItemRenderer;
     COMPILE::SWF
     {
         import flash.text.TextFieldAutoSize;
@@ -29,11 +28,12 @@ package org.apache.royale.jewel.itemRenderers
     COMPILE::JS
     {
         import org.apache.royale.core.WrappedHTMLElement;
-    	import org.apache.royale.html.util.addElementToWrapper;
+        import org.apache.royale.html.util.addElementToWrapper;
     }
-	import org.apache.royale.jewel.beads.controls.TextAlign;
+    import org.apache.royale.html.supportClasses.DataItemRenderer;
+    import org.apache.royale.jewel.beads.controls.TextAlign;
     import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
-	import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
+    import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
 
 	/**
 	 *  The StringItemRenderer class displays data in string form using the data's toString()
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
index d7bc550..50a5c3f 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
@@ -142,7 +142,7 @@ $combobox-item-min-heigh: 34px
         .jewel.list
             max-height: ( $combobox-item-min-heigh + 14 ) * 5 !important
     .jewel.item
-        height: $combobox-item-min-heigh + 14 !important //this should match $item-min-heigh in _itemrenderer.sass
+        min-height: $combobox-item-min-heigh + 14 !important //this should match $item-min-heigh in _itemrenderer.sass
 
 @media (min-width: $desktop)
     .combobox-popup
@@ -166,7 +166,7 @@ $combobox-item-min-heigh: 34px
                 left: auto
 
                 .jewel.item
-                    height: $combobox-item-min-heigh //this should match $item-min-heigh in _itemrenderer.sass
+                    min-height: $combobox-item-min-heigh //this should match $item-min-heigh in _itemrenderer.sass
 
 
 // this is a StyledUIBase with a List inside