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 2018/07/22 06:59:47 UTC
[royale-asjs] branch develop updated: - make horizontal & vertical
layouts take precedence over other rules if exists - Fixes to use centered
content on SectionContents
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 95fa8a6 - make horizontal & vertical layouts take precedence over other rules if exists - Fixes to use centered content on SectionContents
95fa8a6 is described below
commit 95fa8a6d36b4072d164e5dcf758a146718b30a39
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Jul 22 08:59:42 2018 +0200
- make horizontal & vertical layouts take precedence over other rules if exists
- Fixes to use centered content on SectionContents
---
.../royale/JewelExample/src/main/royale/MiscelaneaPlayGound.mxml | 1 +
frameworks/projects/Jewel/src/main/resources/defaults.css | 9 ++++++---
frameworks/projects/Jewel/src/main/sass/components/_layout.sass | 6 ++++--
.../projects/Jewel/src/main/sass/components/_sectioncontent.sass | 3 ++-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/MiscelaneaPlayGound.mxml b/examples/royale/JewelExample/src/main/royale/MiscelaneaPlayGound.mxml
index 3a76f25..8eff691 100644
--- a/examples/royale/JewelExample/src/main/royale/MiscelaneaPlayGound.mxml
+++ b/examples/royale/JewelExample/src/main/royale/MiscelaneaPlayGound.mxml
@@ -24,6 +24,7 @@ limitations under the License.
<j:beads>
<js:ContainerDataBinding/>
+ <j:HorizontalCenteredLayout gap="3"/>
</j:beads>
<j:Card width="350">
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index f67da75..15a8739 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -401,7 +401,8 @@ j|Label {
/* Horizontal */
.layout.horizontal {
- flex-flow: row nowrap;
+ flex-direction: row !important;
+ flex-wrap: nowrap;
align-items: flex-start;
}
.layout.horizontal > * {
@@ -482,7 +483,8 @@ j|Label {
/* Vertical */
.layout.vertical {
- flex-flow: column nowrap;
+ flex-direction: column !important;
+ flex-wrap: nowrap;
align-items: flex-start;
}
.layout.vertical > * {
@@ -2628,9 +2630,10 @@ j|Navigation {
}
.jewel.section {
display: none;
+ flex-flow: column nowrap;
}
.jewel.section.is-active {
- display: block;
+ display: flex;
}
.jewel.slider {
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index a5abcce..1a61df0 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -38,7 +38,8 @@ $gap: 0px
/* Horizontal */
.layout
&.horizontal
- flex-flow: row nowrap
+ flex-direction: row !important
+ flex-wrap: nowrap
align-items: flex-start
> *
@@ -65,7 +66,8 @@ $gap: 0px
/* Vertical */
.layout
&.vertical
- flex-flow: column nowrap
+ flex-direction: column !important
+ flex-wrap: nowrap
align-items: flex-start
> *
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass b/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
index 8a4fe88..87ea6b7 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
@@ -24,9 +24,10 @@
.jewel.section
//padding: 40px
display: none
+ flex-flow: column nowrap
&.is-active
- display: block
+ display: flex
j|SectionContent
// IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")