You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/08 19:29:20 UTC
[royale-asjs] branch develop updated: jewel-layouts: some fixes in
css rules for concrete cases
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 fee751e jewel-layouts: some fixes in css rules for concrete cases
fee751e is described below
commit fee751ec0a5580acca1dfdeb7aeea6fadd0451ad
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Mar 8 20:29:10 2020 +0100
jewel-layouts: some fixes in css rules for concrete cases
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 6 +++++-
frameworks/projects/Jewel/src/main/sass/components/_layout.sass | 6 ++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index f443e42..1d99389 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1023,7 +1023,7 @@ j|Label {
align-items: flex-start;
}
.layout.horizontal > * {
- flex: 0 0 auto;
+ flex: 0 1 auto;
}
.layout.horizontal.flow {
flex-wrap: wrap;
@@ -1134,6 +1134,9 @@ j|Label {
flex-direction: column;
height: 100%;
}
+.layout.vertical.centered > * {
+ flex: 0 0 auto;
+}
.layout.vertical.form {
width: 100%;
}
@@ -3558,6 +3561,7 @@ j|ScrollableSectionContent {
j|HSlider {
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SliderRangeModel");
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.SliderView");
+ IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout");
IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.SliderMouseController");
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index 204a9f4..549043c 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -44,7 +44,6 @@ $gap-size: 10px !default
.layout
display: flex
- //position: relative
// Horizontal
&.horizontal
@@ -53,7 +52,7 @@ $gap-size: 10px !default
align-items: flex-start
> *
- flex: 0 0 auto
+ flex: 0 1 auto
&.flow
flex-wrap: wrap
@@ -115,6 +114,9 @@ $gap-size: 10px !default
flex-direction: column
height: 100%
+ > *
+ flex: 0 0 auto
+
// FormLayout (consider for now Forms are always vertical)
&.form
width: 100%