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/02/27 10:36:15 UTC
[royale-asjs] branch develop updated: jjewel-card: fix internal
size issues. Layout classes was removed incorrectly
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 4a504e3 jjewel-card: fix internal size issues. Layout classes was removed incorrectly
4a504e3 is described below
commit 4a504e3df9e49628ed6f0a8a26729d2f59a884a2
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Feb 27 11:36:04 2020 +0100
jjewel-card: fix internal size issues. Layout classes was removed incorrectly
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 1 +
.../projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as | 2 +-
frameworks/projects/Jewel/src/main/sass/components/_card.sass | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 63583ba..2b52d94 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -309,6 +309,7 @@ j|ToggleButtonBar {
color: inherit;
text-decoration: none;
overflow: hidden;
+ flex: 1 1 auto;
}
.jewel.card .cardActions {
width: 100%;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as
index 1c95d69..3fcf61d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as
@@ -44,7 +44,7 @@ package org.apache.royale.jewel
{
super();
- typeNames = "jewel card";
+ typeNames += " card";
// Add basic card styles by default when use Card alone
// if Card composes CardPrimaryContent, then remove it for more complex structure and styles
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_card.sass b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
index fff2f9d..af6224d 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
@@ -48,6 +48,8 @@ $card-primary-content-minheight: 152px !default
text-decoration: none
overflow: hidden
+ flex: 1 1 auto
+
.cardActions
width: 100%
position: relative