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/11/14 19:25:32 UTC
[royale-asjs] branch develop updated: some improvements in section
and grid layout
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 6616a6d some improvements in section and grid layout
6616a6d is described below
commit 6616a6dcc211de153c8ddc74fb3d2ac361436b81
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Nov 14 20:25:24 2018 +0100
some improvements in section and grid layout
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 2 +-
frameworks/projects/Jewel/src/main/sass/components/_layout.sass | 2 +-
frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index be61edd..dfbee22 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1007,7 +1007,6 @@ j|Label {
.layout.grid {
flex-flow: row wrap;
width: 100%;
- height: 100%;
}
.layout.grid > * {
flex: 0 0 auto;
@@ -3134,6 +3133,7 @@ j|Spinner {
.jewel.section {
display: none;
flex-flow: column nowrap;
+ height: 100%;
}
.jewel.section.is-active {
display: flex;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index 13e6dbf..92bf99f 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -146,7 +146,7 @@ $gap-size: 10px !default
&.grid
flex-flow: row wrap
width: 100%
- height: 100%
+ // height: 100%
> *
flex: 0 0 auto // flex-grow, flex-shrink and flex-basis
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass b/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
index d08b2fc..46c507a 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
@@ -25,6 +25,7 @@
//padding: 40px
display: none
flex-flow: column nowrap
+ height: 100%
&.is-active
display: flex