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/30 18:33:08 UTC
[royale-asjs] branch develop updated: jewel-datagriditemrenderer:
specialize the default renderer for datagrid
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 3e91484 jewel-datagriditemrenderer: specialize the default renderer for datagrid
3e91484 is described below
commit 3e91484a1b958808c7ba11c2a0c673c6e4f5e6ae
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Dec 30 19:32:59 2019 +0100
jewel-datagriditemrenderer: specialize the default renderer for datagrid
---
.../projects/Jewel/src/main/resources/defaults.css | 8 ++++----
.../jewel/itemRenderers/DataGridItemRenderer.as | 2 +-
.../Jewel/src/main/sass/components/_datagrid.sass | 2 +-
.../src/main/sass/components/_itemRenderer.sass | 2 +-
.../JewelTheme/src/main/resources/defaults.css | 24 +++++++++++-----------
.../main/sass/components-emphasized/_datagrid.sass | 2 +-
.../main/sass/components-primary/_datagrid.sass | 4 ++--
.../sass/components-primary/_itemRenderer.sass | 2 +-
.../main/sass/components-secondary/_datagrid.sass | 2 +-
9 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 96e5bf8..4b33600 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -938,7 +938,7 @@ j|ImageButton {
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ImageModel");
}
-.jewel.item, .jewel.navigationlink, .jewel.tabbarbutton {
+.jewel.item, .jewel.navigationlink, .jewel.tabbarbutton, .jewel.datagriditem {
display: block;
min-height: 34px;
text-decoration: none;
@@ -947,14 +947,14 @@ j|ImageButton {
overflow: hidden;
cursor: auto;
}
-.jewel.item.mxmlContent, .jewel.navigationlink.mxmlContent, .jewel.tabbarbutton.mxmlContent {
+.jewel.item.mxmlContent, .jewel.navigationlink.mxmlContent, .jewel.tabbarbutton.mxmlContent, .jewel.datagriditem.mxmlContent {
display: flex;
align-items: center;
}
-.jewel.item.selectable, .jewel.navigationlink.selectable, .jewel.tabbarbutton.selectable {
+.jewel.item.selectable, .jewel.navigationlink.selectable, .jewel.tabbarbutton.selectable, .jewel.datagriditem.selectable {
cursor: pointer;
}
-.jewel.item .fonticon, .jewel.navigationlink .fonticon, .jewel.tabbarbutton .fonticon {
+.jewel.item .fonticon, .jewel.navigationlink .fonticon, .jewel.tabbarbutton .fonticon, .jewel.datagriditem .fonticon {
cursor: inherit;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DataGridItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DataGridItemRenderer.as
index 472ed41..11d69b3 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DataGridItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DataGridItemRenderer.as
@@ -33,7 +33,7 @@ package org.apache.royale.jewel.itemRenderers
{
super();
- typeNames = "jewel item dg";
+ typeNames = "jewel datagriditem";
}
}
}
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index 685f4bc..28b6184 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -42,7 +42,7 @@
&.last
- .jewel.item
+ .jewel.datagriditem
j|DataGrid
IDataGridPresentationModel: ClassReference("org.apache.royale.jewel.beads.models.DataGridPresentationModel")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
index 3bd361d..6975ba1 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
@@ -22,7 +22,7 @@
// ListItemRenderer variables
$item-min-height: 34px
-.jewel.item, .jewel.navigationlink, .jewel.tabbarbutton
+.jewel.item, .jewel.navigationlink, .jewel.tabbarbutton, .jewel.datagriditem
display: block // this works better when render is just text
min-height: $item-min-height
text-decoration: none
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 8631b48..5874b2e 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -332,13 +332,13 @@ j|Card {
.jewel.datagrid .jewel.list.column.last {
border-bottom-right-radius: 0.25rem;
}
-.jewel.datagrid .jewel.list.column .jewel.item {
+.jewel.datagrid .jewel.list.column .jewel.datagriditem {
border-bottom: 1px solid #ededed;
}
-.jewel.datagrid .jewel.list.column .jewel.item.primary.hovered {
+.jewel.datagrid .jewel.list.column .jewel.datagriditem.primary.hovered {
background: #75c5f5;
}
-.jewel.datagrid .jewel.list.column .jewel.item.primary.selected, .jewel.datagrid .jewel.list.column .jewel.item.primary.selectable:active {
+.jewel.datagrid .jewel.list.column .jewel.datagriditem.primary.selected, .jewel.datagrid .jewel.list.column .jewel.datagriditem.primary.selectable:active {
background: #5dbbf3;
}
@@ -613,19 +613,19 @@ j|FormItem {
color: rgba(255, 255, 255, 0.5);
}
-.jewel.item {
+.jewel.item, .jewel.datagriditem {
padding: 8px;
}
-.jewel.item.hovered {
+.jewel.item.hovered, .jewel.datagriditem.hovered {
color: #FFFFFF;
}
-.jewel.item.selected, .jewel.item.selectable:active {
+.jewel.item.selected, .jewel.item.selectable:active, .jewel.datagriditem.selected, .jewel.datagriditem.selectable:active {
color: #FFFFFF;
}
-.jewel.item.primary.hovered {
+.jewel.item.primary.hovered, .jewel.datagriditem.primary.hovered {
background: #3CADF1;
}
-.jewel.item.primary.selected, .jewel.item.primary.selectable:active {
+.jewel.item.primary.selected, .jewel.item.primary.selectable:active, .jewel.datagriditem.primary.selected, .jewel.datagriditem.primary.selectable:active {
background: #24a3ef;
}
@@ -1304,10 +1304,10 @@ j|Wizard {
text-shadow: unset;
}
-.jewel.datagrid .jewel.list.column .jewel.item.secondary.hovered {
+.jewel.datagrid .jewel.list.column .jewel.datagriditem.secondary.hovered {
background: #f38663;
}
-.jewel.datagrid .jewel.list.column .jewel.item.secondary.selected, .jewel.datagrid .jewel.list.column .jewel.item.secondary.selectable:active {
+.jewel.datagrid .jewel.list.column .jewel.datagriditem.secondary.selected, .jewel.datagrid .jewel.list.column .jewel.datagriditem.secondary.selectable:active {
background: #f1744b;
}
@@ -1414,10 +1414,10 @@ a:active {
text-shadow: unset;
}
-.jewel.datagrid .jewel.list.column .jewel.item.emphasized.hovered {
+.jewel.datagrid .jewel.list.column .jewel.datagriditem.emphasized.hovered {
background: #a8d46b;
}
-.jewel.datagrid .jewel.list.column .jewel.item.emphasized.selected, .jewel.datagrid .jewel.list.column .jewel.item.emphasized.selectable:active {
+.jewel.datagrid .jewel.list.column .jewel.datagriditem.emphasized.selected, .jewel.datagrid .jewel.list.column .jewel.datagriditem.emphasized.selectable:active {
background: #9cce58;
}
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_datagrid.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_datagrid.sass
index 0b2d0d5..8a19e8d 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_datagrid.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_datagrid.sass
@@ -20,7 +20,7 @@
// Jewel DataGrid
.jewel.datagrid
.jewel.list.column
- .jewel.item
+ .jewel.datagriditem
&.emphasized
&.hovered
background: lighten($emphasized-color, 12%)
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datagrid.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datagrid.sass
index c9690b9..4c42b9f 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datagrid.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datagrid.sass
@@ -55,9 +55,9 @@
&.last
border-bottom-right-radius: $border-radius
- .jewel.item
+ .jewel.datagriditem
border-bottom: 1px solid lighten($default-color, 8%)
-
+
&.primary
&.hovered
background: lighten($primary-color, 12%)
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 63d06e0..858df06 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
@@ -21,7 +21,7 @@
$itemrenderer-padding: 8px
// ListItemRenderer variables
-.jewel.item
+.jewel.item, .jewel.datagriditem
padding: $itemrenderer-padding
&.hovered
color: $font-theme-color
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_datagrid.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_datagrid.sass
index 079fd36..37f8f49 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_datagrid.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_datagrid.sass
@@ -20,7 +20,7 @@
// Jewel DataGrid
.jewel.datagrid
.jewel.list.column
- .jewel.item
+ .jewel.datagriditem
&.secondary
&.hovered
background: lighten($secondary-color, 12%)