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 alert layout
Date Sun, 06 May 2018 07:09:39 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 6ed89ec  Fix alert layout
6ed89ec is described below

commit 6ed89ecf5088d425197751514893c145f6dbb6e9
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Sun May 6 09:09:34 2018 +0200

    Fix alert layout
---
 frameworks/projects/Jewel/src/main/resources/defaults.css    | 6 ------
 frameworks/projects/Jewel/src/main/sass/_global.sass         | 4 ++--
 frameworks/themes/JewelTheme/src/main/resources/defaults.css | 8 ++++----
 frameworks/themes/JewelTheme/src/main/sass/_global.sass      | 7 +++----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 7734c1f..45a0e8e 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -45,12 +45,6 @@ j|View {
   IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout");
 }
 
-@media -royale-swf {
-  j|View {
-    IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
-    IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
-  }
-}
 .jewel.alert {
   display: block;
   position: fixed;
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 93b0ed4..8202259 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -44,5 +44,5 @@ j|View
 
 @media -royale-swf
 	j|View
-		IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead")
-		IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead")
+		// --- IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead")
+		// --- IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead")
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index c8e8cc4..a73d8e9 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -16,16 +16,16 @@
  */
 @namespace j "library://ns.apache.org/royale/jewel";
 @namespace "http://www.w3.org/1999/xhtml";
-.royale *, .royale *:before, .royale *:after {
-  box-sizing: border-box;
-}
-
 j|Application {
   background: white;
   font-family: "Lato", sans-serif;
   color: #808080;
 }
 
+j|Application *, .royale *, .royale *:before, .royale *:after {
+  box-sizing: border-box;
+}
+
 h1 {
   font-size: 2em;
 }
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_global.sass b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
index f823320..b7180cf 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_global.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
@@ -20,16 +20,15 @@
 @namespace j "library://ns.apache.org/royale/jewel"
 @namespace "http://www.w3.org/1999/xhtml"
 
-
-.royale *, .royale *:before, .royale *:after
-	box-sizing: border-box
-	
 j|Application
 	background: $background-color
 	font:
 		family: $font-stack
 	color: $default-font-color
 
+j|Application *, .royale *, .royale *:before, .royale *:after
+	box-sizing: border-box
+
 h1
 	font-size: 2em
 

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

Mime
View raw message