This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/jewel-ui-set by this
push:
new 2866a2f update controlbar child styles in alert to not inherit from
jewel lib
2866a2f is described below
commit 2866a2fe4bd0035aad4355bafd53917efb3794d8
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Apr 1 19:05:40 2018 +0200
update controlbar child styles in alert to not inherit from jewel lib
---
examples/royale/JewelExample/pom.xml | 1 +
frameworks/projects/Jewel/src/main/resources/defaults.css | 6 ------
.../projects/Jewel/src/main/sass/components/_alert.sass | 8 ++++----
.../themes/JewelTheme/src/main/resources/defaults.css | 4 ++++
.../JewelTheme/src/main/sass/components/_alert.sass | 15 ++++-----------
5 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/examples/royale/JewelExample/pom.xml
b/examples/royale/JewelExample/pom.xml
index 5427bc4..b5df326 100644
--- a/examples/royale/JewelExample/pom.xml
+++ b/examples/royale/JewelExample/pom.xml
@@ -48,6 +48,7 @@
<configuration>
<mainClass>App.mxml</mainClass>
<targets>JSRoyale,SWF</targets>
+ <debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index f51bc13..059f477 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -82,12 +82,6 @@
bottom: 0;
height: 50px;
}
-.jewel.alert .jewel.controlbar > *:first-child {
- margin-left: 0px;
-}
-.jewel.alert .jewel.controlbar > * {
- margin-left: 6px;
-}
.jewel.alert + .backdrop {
background-color: rgba(0, 0, 0, 0.5);
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
b/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
index ffdfd22..5c368ab 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
@@ -112,10 +112,10 @@ $alert-modal-opacity: .5
// @else if $alert-control-bar-align == left
// left: 0
- > *:first-child
- margin-left: 0px
- > *
- margin-left: 6px
+ // > *:first-child
+ // margin-left: 0px
+ // > *
+ // margin-left: 6px
+ .backdrop
background-color: rgba(0, 0, 0, $alert-modal-opacity)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 9f658c1..9c540bf 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -109,8 +109,12 @@ div {
display: flex;
justify-content: flex-end;
}
+.jewel.alert .jewel.controlbar > *:first-child {
+ margin-left: 0px;
+}
.jewel.alert .jewel.controlbar > * {
flex: 0 0 100px;
+ margin-left: 6px;
}
.jewel.alert + .backdrop {
background-color: rgba(0, 0, 0, 0.5);
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_alert.sass
b/frameworks/themes/JewelTheme/src/main/sass/components/_alert.sass
index c431453..68f8296 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_alert.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_alert.sass
@@ -104,19 +104,12 @@ $alert-modal-opacity: .5
display: flex
justify-content: flex-end
- // @if $alert-control-bar-align == 'center'
- // left: 50%
- // transform: translate(-50%, 0%)
- // @else if $alert-control-bar-align == 'right'
- // right: 0
- // @else if $alert-control-bar-align == 'left'
- // left: 0
-
- // > *:first-child
- // margin-left: 0px
+
+ > *:first-child
+ margin-left: 0px
> *
flex: 0 0 100px
- //margin-left: 6px
+ margin-left: 6px
+ .backdrop
background-color: rgba(0, 0, 0, $alert-modal-opacity)
--
To stop receiving notification emails like this one, please contact
[email protected].
