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/12 23:47:19 UTC
[royale-asjs] 18/42: jewel-datagrid: global styling for header and
list columns
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
commit 00066216e2180a3125940dbefb056f9e08960719
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Nov 30 13:23:28 2019 +0100
jewel-datagrid: global styling for header and list columns
---
.../projects/Jewel/src/main/resources/defaults.css | 15 ++++++++++----
.../jewel/itemRenderers/ButtonBarItemRenderer.as | 1 -
.../Jewel/src/main/sass/components/_datagrid.sass | 24 +++++++++++++++-------
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 512d3a4..e95ab07 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -488,15 +488,22 @@ j|ComboBoxPopUp {
width: 200px;
height: 290px;
}
-
-.jewel.list.column {
+.jewel.datagrid .jewel.buttonbar.header .jewel.button.first {
+ border-bottom-left-radius: 0;
+}
+.jewel.datagrid .jewel.buttonbar.header .jewel.button.last {
+ border-bottom-right-radius: 0;
+}
+.jewel.datagrid .jewel.list.column {
border-radius: 0px;
}
-.jewel.list.column.first {
+.jewel.datagrid .jewel.list.column.first {
border-right: 0px;
+ border-bottom-left-radius: 0.25rem;
}
-.jewel.list.column.last {
+.jewel.datagrid .jewel.list.column.last {
border-left: 0px;
+ border-bottom-right-radius: 0.25rem;
}
j|DataGrid {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
index d852528..aa210be 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
@@ -176,7 +176,6 @@ package org.apache.royale.jewel.itemRenderers
}
private var _index:int;
-
/**
* The position with the dataProvider being shown by the itemRenderer instance.
*
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index 7523558..4679d9d 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -18,19 +18,29 @@
////////////////////////////////////////////////////////////////////////////////
// Jewel DataGrid
+$border-radius: .25rem
// DataGrid variables
-
.jewel.datagrid
width: 200px
height: 290px
-.jewel.list.column
- border-radius: 0px
- &.first
- border-right: 0px
- &.last
- border-left: 0px
+ .jewel.buttonbar.header
+ .jewel.button
+ &.first
+ border-bottom-left-radius: 0
+
+ &.last
+ border-bottom-right-radius: 0
+
+ .jewel.list.column
+ border-radius: 0px
+ &.first
+ border-right: 0px
+ border-bottom-left-radius: $border-radius
+ &.last
+ border-left: 0px
+ border-bottom-right-radius: $border-radius
j|DataGrid
IChangePropagator: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnChangePropagator")