You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2019/04/08 08:34:40 UTC

[royale-asjs] branch develop updated: Improved IE11 compatibility for Alert and DataContainer Flow layout in Tour de Jewel.

This is an automated email from the ASF dual-hosted git repository.

gregdove 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 c47280e  Improved IE11 compatibility for Alert and DataContainer Flow layout in Tour de Jewel.
c47280e is described below

commit c47280ef8c6362a59d61f3d64af6104d3c68e3e8
Author: greg-dove <gr...@gmail.com>
AuthorDate: Mon Apr 8 20:34:20 2019 +1200

    Improved IE11 compatibility for Alert and DataContainer Flow layout in Tour de Jewel.
---
 frameworks/projects/Jewel/src/main/resources/defaults.css       | 7 +++++++
 frameworks/projects/Jewel/src/main/sass/_global.sass            | 1 +
 frameworks/projects/Jewel/src/main/sass/components/_alert.sass  | 5 +++++
 frameworks/projects/Jewel/src/main/sass/components/_layout.sass | 1 +
 4 files changed, 14 insertions(+)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 7f2fcd3..7ac94b1 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -141,6 +141,7 @@ hr {
 .jewel.multiline {
   white-space: pre-wrap !important;
   word-wrap: break-word;
+  max-width: 100%;
 }
 
 .responsiveSizeMonitor {
@@ -181,6 +182,11 @@ hr {
   height: 50px;
 }
 
+@media all and (-ms-high-contrast: none) {
+  .jewel.alert {
+    display: table;
+  }
+}
 @media (min-width: 768px) {
   .jewel.alert {
     min-width: 450px;
@@ -922,6 +928,7 @@ j|Label {
 }
 .layout.horizontal.flow {
   flex-wrap: wrap;
+  max-width: 100%;
 }
 .layout.horizontal.centered {
   justify-content: center;
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 4c95e68..8d33802 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -144,6 +144,7 @@ hr
 	&.multiline
 		white-space: pre-wrap !important
 		word-wrap: break-word
+		max-width: 100%
 
 .responsiveSizeMonitor
 	background: rgba(0,0,0,0.8)
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_alert.sass b/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
index 8e46acf..88235d1 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
@@ -125,6 +125,11 @@ $alert-footer-height: 50px
     + .backdrop
         //background-color: rgba(0, 0, 0, $alert-modal-opacity)
 
+//hack to fix IE display in Alert:
+@media all and (-ms-high-contrast: none)
+    .jewel.alert
+        display: table
+		
 @media (min-width: $tablet)
     .jewel.alert
         min-width: $alert-min-width + 100
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index 9788cd8..1c77362 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -57,6 +57,7 @@ $gap-size: 10px !default
 
 		&.flow
 			flex-wrap: wrap
+			max-width: 100%
 
 		&.centered
 			justify-content: center