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 0a005bd jewel-layouts: gap should not affect to unrelated margins
0a005bd is described below
commit 0a005bd967787f7ce0bc150ce612b7db6aeb2f4d
Author: Carlos Rovira <[email protected]>
AuthorDate: Mon Feb 24 13:15:34 2020 +0100
jewel-layouts: gap should not affect to unrelated margins
---
.../projects/Jewel/src/main/resources/defaults.css | 40 +++++++++++-----------
.../Jewel/src/main/sass/components/_layout.sass | 4 +--
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 882e8b7..1b97025 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1044,64 +1044,64 @@ j|Label {
align-items: flex-start;
}
.layout.horizontal.gap-1x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-1x3px > * {
- margin: 0px 0px 0px 3px;
+ margin-left: 3px;
}
.layout.horizontal.gap-2x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-2x3px > * {
- margin: 0px 0px 0px 6px;
+ margin-left: 6px;
}
.layout.horizontal.gap-3x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-3x3px > * {
- margin: 0px 0px 0px 9px;
+ margin-left: 9px;
}
.layout.horizontal.gap-4x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-4x3px > * {
- margin: 0px 0px 0px 12px;
+ margin-left: 12px;
}
.layout.horizontal.gap-5x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-5x3px > * {
- margin: 0px 0px 0px 15px;
+ margin-left: 15px;
}
.layout.horizontal.gap-6x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-6x3px > * {
- margin: 0px 0px 0px 18px;
+ margin-left: 18px;
}
.layout.horizontal.gap-7x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-7x3px > * {
- margin: 0px 0px 0px 21px;
+ margin-left: 21px;
}
.layout.horizontal.gap-8x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-8x3px > * {
- margin: 0px 0px 0px 24px;
+ margin-left: 24px;
}
.layout.horizontal.gap-9x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-9x3px > * {
- margin: 0px 0px 0px 27px;
+ margin-left: 27px;
}
.layout.horizontal.gap-10x3px > *:first-child {
- margin: 0px;
+ margin-left: 0px;
}
.layout.horizontal.gap-10x3px > * {
- margin: 0px 0px 0px 30px;
+ margin-left: 30px;
}
.layout.horizontal.sameWidths > * {
flex: 1 0 0;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index a497988..864259c 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -77,9 +77,9 @@ $gap-size: 10px !default
@for $i from 1 through $gaps
&.gap-#{$i}x#{$gap-step}px
> *:first-child
- margin: 0px
+ margin-left: 0px
> *
- margin: 0px 0px 0px ($gap + $i *
$gap-step)
+ margin-left: $gap + $i * $gap-step
&.sameWidths
> *
flex: 1 0 0