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/20 18:29:24 UTC
[royale-asjs] branch develop updated: jwel-centered-layouts:
centered layouts sizing should have priority over other settings in inner
elements (fix #768)
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 f310e7e jwel-centered-layouts: centered layouts sizing should have priority over other settings in inner elements (fix #768)
f310e7e is described below
commit f310e7e5051eacee67fcf90814e00e68180d6e4b
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Mar 20 19:29:20 2020 +0100
jwel-centered-layouts: centered layouts sizing should have priority over other settings in inner elements (fix #768)
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 4 ++--
frameworks/projects/Jewel/src/main/sass/components/_layout.sass | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index e01db13..621f1e8 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1040,7 +1040,7 @@ j|Label {
align-content: center;
}
.layout.horizontal.centered > * {
- flex: 0 0 auto;
+ flex: 0 0 auto !important;
}
.layout.horizontal.formitem {
width: 100%;
@@ -1143,7 +1143,7 @@ j|Label {
height: 100%;
}
.layout.vertical.centered > * {
- flex: 0 0 auto;
+ flex: 0 0 auto !important;
}
.layout.vertical.form {
width: 100%;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index da23952..46e262d 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -67,8 +67,10 @@ $gap-size: 10px !default
align-items: center
align-content: center
// height: 100%
+
+ // for centered layouts we need priority
> *
- flex: 0 0 auto
+ flex: 0 0 auto !important
// FormItemLayout
&.formitem
@@ -122,8 +124,9 @@ $gap-size: 10px !default
flex-direction: column
height: 100%
- > *
- flex: 0 0 auto
+ // for centered layouts we need priority
+ > *
+ flex: 0 0 auto !important
// FormLayout (consider for now Forms are always vertical)
&.form