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 223de78  jewel-datechooser: improve styles for disabled selected dates
223de78 is described below

commit 223de78cbf7699d0100789af1c0ad9eb801e7797
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Jan 2 16:21:29 2021 +0100

    jewel-datechooser: improve styles for disabled selected dates
---
 frameworks/themes/JewelTheme/src/main/resources/defaults.css | 12 ++++++++----
 .../src/main/sass/components-primary/_datechooser.sass       |  5 +----
 .../JewelTheme/src/main/sass/components-primary/_table.sass  |  8 ++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css 
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 47ae867..d768e91 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -632,10 +632,6 @@ j|CardActions {
 .calendar.item.date {
   color: grey;
 }
-.calendar[disabled] {
-  color: silver;
-  pointer-events: none;
-}
 
 .jewel.datefield .jewel.textinput input {
   border-radius: 0.25rem 0px 0px 0.25rem;
@@ -1302,9 +1298,17 @@ j|TabBar {
 .jewel.tableitem.calendar {
   border-radius: 4px;
 }
+.jewel.tableitem.calendar[disabled] {
+  color: silver;
+  pointer-events: none;
+}
 .jewel.tableitem.calendar.selected {
   font-weight: bold;
 }
+.jewel.tableitem.calendar.selected[disabled] {
+  color: #FFFFFF;
+  background: #cccccc;
+}
 
 a:link {
   color: #3CADF1;
diff --git 
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
 
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
index baf6ada..7e6af67 100644
--- 
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
+++ 
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
@@ -141,7 +141,4 @@ $datechooser-buttons-border-radius: 50%
 
         &.date
             color: grey
-        
-    &[disabled]
-        color: $disabled-font-color
-        pointer-events: none
\ No newline at end of file
+        
\ No newline at end of file
diff --git 
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass 
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
index 27ba248..ccb0989 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
@@ -158,5 +158,13 @@ $table-border-radius: $border-radius
     &.calendar
         border-radius: 4px
 
+        &[disabled]
+            color: $disabled-font-color
+            pointer-events: none
+        
         &.selected
             font-weight: bold
+
+            &[disabled]
+                color: $font-theme-color
+                background: darken($disabled-color, 15%)
\ No newline at end of file

Reply via email to