You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2022/10/09 21:19:00 UTC

[royale-asjs] branch develop updated: Quick fix for maven build. @Hugo please check that the final CSS is correct here.

This is an automated email from the ASF dual-hosted git repository.

gregdove 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 0ff1ed6b86 Quick fix for maven build. @Hugo please check that the final CSS is correct here.
0ff1ed6b86 is described below

commit 0ff1ed6b8692ab9c226a3814417cae197b4a7117
Author: greg-dove <gr...@gmail.com>
AuthorDate: Mon Oct 10 10:15:58 2022 +1300

    Quick fix for maven build. @Hugo please check that the final CSS is correct here.
---
 .../projects/Jewel/src/main/resources/defaults.css | 27 ++++------------------
 .../Jewel/src/main/sass/components/_datagrid.sass  |  8 ++++---
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 3eacc95d27..8b09d756ee 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -466,6 +466,11 @@ j|VirtualComboBoxPopUp {
       width: 100%; }
   .jewel.datagrid span:empty:before {
     content: "\200b"; }
+  .jewel.datagrid .first.jewel.list, .jewel.datagrid .middle.jewel.list {
+    -ms-overflow-style: none;
+    scrollbar-width: none; }
+    .jewel.datagrid .first.jewel.list::-webkit-scrollbar, .jewel.datagrid .middle.jewel.list::-webkit-scrollbar {
+      display: none; }
 
 j|DataGrid {
   IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DataGridView");
@@ -587,28 +592,6 @@ j|DateChooser {
       transition: transform 0.4s 0ms, opacity 0.4s 0ms;
       opacity: 1; }
 
-.first.jewel.list::-webkit-scrollbar
-{
-    display: none;
-}
-
-.first.jewel.list
-{
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-}
-
-.middle.jewel.list::-webkit-scrollbar
-{
-    display: none;
-}
-
-.middle.jewel.list
-{
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-}
-
 @media (max-width: 768px) {
   .datechooser-popup .jewel.table {
     width: calc(100% - 20px); } }
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index f580ffe92b..27d3bc54d4 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -59,10 +59,12 @@
         //content: "\200b" <-- this does not survive sass compilation, so instead using a token for replacement in a post-sass processing step above
 
     .first.jewel.list, .middle.jewel.list
+        -ms-overflow-style: none
+        scrollbar-width: none
+
         &::-webkit-scrollbar
-        display: none;
-        -ms-overflow-style: none;
-        scrollbar-width: none;
+            display: none
+
 
 j|DataGrid
     IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DataGridView")