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/21 11:59:19 UTC
[royale-asjs] branch develop updated: jewel-card: more fixes for
additional cases in simple cards
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 cfc8004 jewel-card: more fixes for additional cases in simple cards
cfc8004 is described below
commit cfc8004666f4ea02187fe7b3b3e4a7f6b27141bb
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Mar 21 12:59:14 2020 +0100
jewel-card: more fixes for additional cases in simple cards
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 4 ++--
frameworks/projects/Jewel/src/main/sass/components/_card.sass | 7 +++++--
frameworks/themes/JewelTheme/src/main/resources/defaults.css | 1 -
.../themes/JewelTheme/src/main/sass/components-primary/_card.sass | 1 -
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 621f1e8..48bc5e2 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -309,7 +309,7 @@ j|ToggleButtonBar {
}
.jewel.card {
- min-width: 240px;
+ min-width: 120px;
min-height: 52px;
position: relative;
}
@@ -323,7 +323,7 @@ j|ToggleButtonBar {
outline: none;
color: inherit;
text-decoration: none;
- flex: 1 1 0%;
+ flex: 1 1 auto;
}
.jewel.card .cardActions {
width: 100%;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_card.sass b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
index 9dedc14..5770382 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
@@ -20,7 +20,7 @@
// Jewel Card
// Card variables
-$card-width: 240px !default
+$card-width: 120px !default
$card-height: 52px !default
$card-primary-content-minheight: 152px !default
@@ -33,6 +33,9 @@ $card-primary-content-minheight: 152px !default
// width: 350px
position: relative
//z-index: 1
+
+ &.simple
+ // flex: 1 1 0%
.cardHeader
width: 100%
@@ -46,7 +49,7 @@ $card-primary-content-minheight: 152px !default
color: inherit
text-decoration: none
- flex: 1 1 0%
+ flex: 1 1 auto
.cardActions
width: 100%
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 2df4b75..48ddc5b 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -366,7 +366,6 @@ hr {
}
.jewel.card.simple {
padding: 20px;
- flex: 1 1 0%;
}
.jewel.card .cardHeader {
border-bottom: 1px solid #d2dadf;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
index 581397f..874dca2 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
@@ -38,7 +38,6 @@
&.simple
padding: 20px
- flex: 1 1 0%
.cardHeader
@if $flat