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/09/21 16:30:53 UTC
[royale-asjs] branch develop updated: jewel-datagrid: fix double
border style around DG also strange box-shadow in items caused from
jewel.item inheritance
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 bf227b8 jewel-datagrid: fix double border style around DG also strange box-shadow in items caused from jewel.item inheritance
bf227b8 is described below
commit bf227b8b105e1c0465392b9607fb243a806e2193
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Sep 21 18:30:42 2020 +0200
jewel-datagrid: fix double border style around DG also strange box-shadow in items caused from jewel.item inheritance
---
frameworks/themes/JewelTheme/src/main/resources/defaults.css | 7 ++++---
.../JewelTheme/src/main/sass/components-primary/_datagrid.sass | 9 +++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index ca55591..5252ef7 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -465,7 +465,7 @@ j|CardActions {
.jewel.datagrid {
background: linear-gradient(white, #f3f3f3);
- border: 1px solid #b3b3b3;
+ border-bottom: 1px solid #b3b3b3;
box-shadow: inset 0 1px 0 white;
border-radius: 0.25rem;
}
@@ -483,7 +483,7 @@ j|CardActions {
border-bottom-right-radius: 0;
}
.jewel.datagrid .listarea {
- border-top-width: 1px;
+ border-top-width: 0px;
border-left-width: 0px;
border-right-width: 0px;
border-bottom-width: 0px;
@@ -501,7 +501,7 @@ j|CardActions {
.jewel.datagrid .jewel.list.column {
border-radius: 0px;
border-bottom-width: 0px;
- box-shadow: inset 0px 0.5px 0px 0px rgba(0, 0, 0, 0.25);
+ box-shadow: inset 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
}
.jewel.datagrid .jewel.list.column.first {
border-bottom-left-radius: 0.25rem;
@@ -516,6 +516,7 @@ j|CardActions {
border-bottom: 1px solid #ededed;
border-right: 0;
border-radius: 0;
+ box-shadow: none;
}
.jewel.datagrid .jewel.list.column .jewel.item.datagrid.primary.hovered {
background: #75c5f5;
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 6152d7f..bf594d1 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datagrid.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datagrid.sass
@@ -23,11 +23,11 @@
.jewel.datagrid
@if $flat
background: lighten($default-color, 15%)
- border: 1px solid $default-color
+ border-bottom: 1px solid $default-color
box-shadow: none
@else
background: linear-gradient(lighten($default-color, 15%), lighten($default-color, 10%))
- border: 1px solid darken($default-color, 15%)
+ border-bottom: 1px solid darken($default-color, 15%)
box-shadow: inset 0 1px 0 lighten($default-color, 20%)
border-radius: $border-radius
@@ -52,7 +52,7 @@
border-bottom-right-radius: 0
.listarea
- border-top-width: 1px
+ border-top-width: 0px
border-left-width: 0px
border-right-width: 0px
border-bottom-width: 0px
@@ -81,7 +81,7 @@
border-radius: 0px
border-bottom-width: 0px
@if not $flat
- box-shadow: inset 0px .5px 0px 0px rgba(0,0,0,0.25)
+ box-shadow: inset 0px 1px 0px 0px rgba(0, 0, 0, 0.1)
@else
box-shadow: none
@@ -100,6 +100,7 @@
border-bottom: 1px solid lighten($default-color, 8%)
border-right: 0
border-radius: 0
+ box-shadow: none
&.primary
&.hovered