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 d6ebefd jewel-layout-vertical: fix and important issue for content
with height 100% and make gaps only affect to the top to avoid collisions with
other potential settings
d6ebefd is described below
commit d6ebefd2c83e4502a3c2dcba367412fa5d8b41d3
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Feb 28 23:35:42 2020 +0100
jewel-layout-vertical: fix and important issue for content with height 100%
and make gaps only affect to the top to avoid collisions with other potential
settings
---
.../projects/Jewel/src/main/resources/defaults.css | 42 +++++++++++-----------
.../Jewel/src/main/sass/components/_layout.sass | 6 ++--
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 6c4e7e5..35c5b82 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1121,7 +1121,7 @@ j|Label {
align-items: flex-start;
}
.layout.vertical > * {
- flex: 0 0 auto;
+ flex: 0 1 auto;
}
.layout.vertical.flow {
flex-wrap: wrap;
@@ -1137,64 +1137,64 @@ j|Label {
width: 100%;
}
.layout.vertical.gap-1x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-1x3px > * {
- margin: 3px 0px 0px;
+ margin-top: 3px;
}
.layout.vertical.gap-2x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-2x3px > * {
- margin: 6px 0px 0px;
+ margin-top: 6px;
}
.layout.vertical.gap-3x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-3x3px > * {
- margin: 9px 0px 0px;
+ margin-top: 9px;
}
.layout.vertical.gap-4x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-4x3px > * {
- margin: 12px 0px 0px;
+ margin-top: 12px;
}
.layout.vertical.gap-5x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-5x3px > * {
- margin: 15px 0px 0px;
+ margin-top: 15px;
}
.layout.vertical.gap-6x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-6x3px > * {
- margin: 18px 0px 0px;
+ margin-top: 18px;
}
.layout.vertical.gap-7x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-7x3px > * {
- margin: 21px 0px 0px;
+ margin-top: 21px;
}
.layout.vertical.gap-8x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-8x3px > * {
- margin: 24px 0px 0px;
+ margin-top: 24px;
}
.layout.vertical.gap-9x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-9x3px > * {
- margin: 27px 0px 0px;
+ margin-top: 27px;
}
.layout.vertical.gap-10x3px > *:first-child {
- margin: 0px;
+ margin-top: 0px;
}
.layout.vertical.gap-10x3px > * {
- margin: 30px 0px 0px;
+ margin-top: 30px;
}
.layout.tile {
flex-flow: row wrap;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index 864259c..204a9f4 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -103,7 +103,7 @@ $gap-size: 10px !default
align-items: flex-start
> *
- flex: 0 0 auto
+ flex: 0 1 auto
&.flow
flex-wrap: wrap
@@ -126,9 +126,9 @@ $gap-size: 10px !default
@for $i from 1 through $gaps
&.gap-#{$i}x#{$gap-step}px
> *:first-child
- margin: 0px
+ margin-top: 0px
> *
- margin: ($gap + $i * $gap-step) 0px 0px
+ margin-top: $gap + $i * $gap-step
// Tile
&.tile
