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: fixed sizing issue in IE11 for Alert
Date Wed, 01 Aug 2018 10:35:59 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 27c8592  fixed sizing issue in IE11 for Alert
     new 06794b7  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
27c8592 is described below

commit 27c8592e479bba9072d8e918b48465fd69cc1b49
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Wed Aug 1 12:35:32 2018 +0200

    fixed sizing issue in IE11 for Alert
---
 .../projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as     | 2 +-
 .../src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as    | 1 +
 frameworks/themes/JewelTheme/src/main/resources/defaults.css            | 2 +-
 .../themes/JewelTheme/src/main/sass/components-primary/_alert.sass      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as
index 5ae061b..aada2bf 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as
@@ -158,7 +158,7 @@ package org.apache.royale.jewel
             }
         }
 
-        private var _multiline:Boolean = false;
+        private var _multiline:Boolean;
         /**
 		 *  A boolean flag to activate "multiline" effect selector.
 		 *  Allow the label to have more than one line if needed
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index bcc7f77..0836de1 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -165,6 +165,7 @@ package org.apache.royale.jewel.beads.views
 			content = new Group();
 			content.typeNames = "content";
 			label = new Label();
+			label.multiline = true;
 			label.text = alertModel.message;
 			content.addElement(label);
 			IParent(_strand).addElement(content);
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index cd6166f..1cce179 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -75,7 +75,7 @@ div {
 .jewel.alert {
   margin: 0;
   padding: 0;
-  min-width: 420px;
+  min-width: 300px;
   min-height: 240px;
   border: 0px solid;
   background-color: white;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_alert.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_alert.sass
index ef9e4e1..48d6cc0 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_alert.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_alert.sass
@@ -21,7 +21,7 @@
 
 // Alert variables
 $alert-padding: 20px
-$alert-min-width: 420px
+$alert-min-width: 300px
 $alert-min-height: 240px
 $alert-header-height: 50px
 $alert-footer-height: 84px


Mime
View raw message