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 2019/12/27 16:48:15 UTC
[royale-asjs] branch develop updated: jewel-list: make possible
emphasized renderers
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 d03b6f2 jewel-list: make possible emphasized renderers
d03b6f2 is described below
commit d03b6f26d5e0ff8bc206c6501f058532e72fa1b2
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Dec 27 17:48:03 2019 +0100
jewel-list: make possible emphasized renderers
---
.../royale/jewel/itemRenderers/ListItemRenderer.as | 1 +
.../JewelTheme/src/main/resources/defaults.css | 22 ++++++++++++++++++++--
.../sass/components-emphasized/_itemRenderer.sass | 8 +++++++-
.../sass/components-primary/_itemRenderer.sass | 15 +++++++++------
.../sass/components-secondary/_itemRenderer.sass | 9 ++++++++-
5 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
index 23b2d7e..b6fd37f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
@@ -53,6 +53,7 @@ package org.apache.royale.jewel.itemRenderers
super();
typeNames = "jewel item";
+ emphasis = "primary";
addClass("selectable");
if(MXMLDescriptor != null)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index dac3156..301406b 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -577,10 +577,14 @@ j|FormItem {
}
.jewel.item.hovered {
color: #FFFFFF;
- background: #3CADF1;
}
.jewel.item.selected, .jewel.item.selectable:active {
color: #FFFFFF;
+}
+.jewel.item.primary.hovered {
+ background: #3CADF1;
+}
+.jewel.item.primary.selected, .jewel.item.primary.selectable:active {
background: #24a3ef;
}
@@ -616,7 +620,7 @@ j|FormItem {
.jewel.navigationlink {
margin: 0;
- padding: 0 16px;
+ padding: 0 8px;
font-size: 1em;
font-weight: 500;
color: rgba(0, 0, 0, 0.6);
@@ -1259,6 +1263,13 @@ j|Wizard {
text-shadow: unset;
}
+.jewel.item.secondary.hovered {
+ background: #EF5A2A;
+}
+.jewel.item.secondary.selected, .jewel.item.secondary.selectable:active {
+ background: #ed4812;
+}
+
.jewel.snackbar.secondary .jewel.snackbar-content {
background: linear-gradient(#f16c42, #ed4812);
border: 1px solid #be390e;
@@ -1355,6 +1366,13 @@ a:active {
text-shadow: unset;
}
+.jewel.item.emphasized.hovered {
+ background: #8CC63C;
+}
+.jewel.item.emphasized.selected, .jewel.item.emphasized.selectable:active {
+ background: #7eb435;
+}
+
.jewel.snackbar.emphasized .jewel.snackbar-content {
background: linear-gradient(#98cc50, #7eb435);
border: 1px solid #638c29;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_itemRenderer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_itemRenderer.sass
index 54cc067..c29dea9 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_itemRenderer.sass
@@ -19,4 +19,10 @@
// Jewel ListItemRenderer
-// ListItemRenderer variables
\ No newline at end of file
+// ListItemRenderer variables
+.jewel.item
+ &.emphasized
+ &.hovered
+ background: $emphasized-color
+ &.selected, &.selectable:active
+ background: darken($emphasized-color, 5%)
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
index 7ee919d..63d06e0 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
@@ -18,16 +18,19 @@
////////////////////////////////////////////////////////////////////////////////
// Jewel ListItemRenderer
-$itemrenderer-padding: 16px
+$itemrenderer-padding: 8px
// ListItemRenderer variables
.jewel.item
- padding: 8px
-
+ padding: $itemrenderer-padding
&.hovered
color: $font-theme-color
- background: $primary-color
-
&.selected, &.selectable:active
color: $font-theme-color
- background: darken($primary-color, 5%)
+
+ &.primary
+ &.hovered
+ background: $primary-color
+ &.selected, &.selectable:active
+ background: darken($primary-color, 5%)
+
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_itemRenderer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_itemRenderer.sass
index 54cc067..91cb737 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_itemRenderer.sass
@@ -19,4 +19,11 @@
// Jewel ListItemRenderer
-// ListItemRenderer variables
\ No newline at end of file
+// ListItemRenderer variables
+.jewel.item
+ &.secondary
+ &.hovered
+ background: $secondary-color
+ &.selected, &.selectable:active
+ background: darken($secondary-color, 5%)
+