[royale-asjs] branch develop updated: jewel-theme: fix button text when disabled and hover

[ca...@apache.org]

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 fab7659  jewel-theme: fix button text when disabled and hover
fab7659 is described below

commit fab7659fee3e70ae6cbf6ea2f97b04424cdc856b
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Mar 6 10:22:28 2020 +0100

    jewel-theme: fix button text when disabled and hover
---
 .../JewelTheme/src/main/resources/defaults.css     | 39 ++++++++++++++++++++++
 .../themes/JewelTheme/src/main/sass/_mixins.sass   |  4 +++
 2 files changed, 43 insertions(+)

diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index dc0dcfd..324d5af 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -166,6 +166,9 @@ hr {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button[disabled]:hover, .jewel.button[disabled]:hover:focus {
+  color: silver;
+}
 .jewel.button[disabled] {
   font-weight: 400;
 }
@@ -216,6 +219,9 @@ hr {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.primary[disabled]:hover, .jewel.button.primary[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.outlined {
   background: rgba(179, 179, 179, 0.05);
@@ -246,6 +252,9 @@ hr {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.outlined[disabled]:hover, .jewel.button.outlined[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.primary.outlined {
   background: rgba(60, 173, 241, 0.05);
@@ -276,6 +285,9 @@ hr {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.primary.outlined[disabled]:hover, .jewel.button.primary.outlined[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.unboxed {
   background: rgba(179, 179, 179, 0);
@@ -307,6 +319,9 @@ hr {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.unboxed[disabled]:hover, .jewel.button.unboxed[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.primary.unboxed {
   background: rgba(60, 173, 241, 0);
@@ -338,6 +353,9 @@ hr {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.primary.unboxed[disabled]:hover, .jewel.button.primary.unboxed[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.card {
   font-size: 1em;
@@ -1691,6 +1709,9 @@ j|Wizard {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.secondary[disabled]:hover, .jewel.button.secondary[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.secondary.outlined {
   background: rgba(239, 90, 42, 0.05);
@@ -1721,6 +1742,9 @@ j|Wizard {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.secondary.outlined[disabled]:hover, .jewel.button.secondary.outlined[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.secondary.unboxed {
   background: rgba(239, 90, 42, 0);
@@ -1752,6 +1776,9 @@ j|Wizard {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.secondary.unboxed[disabled]:hover, .jewel.button.secondary.unboxed[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.datagrid .jewel.list.column .jewel.item.datagrid.secondary.hovered {
   background: #f38663;
@@ -1917,6 +1944,9 @@ a:active {
   color: silver;
   text-shadow: unset;
 }
+.jewel.togglebutton.secondary.unboxed[disabled]:hover, .jewel.togglebutton.secondary.unboxed[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.badge.emphasized {
   background: #8CC63C;
@@ -1954,6 +1984,9 @@ a:active {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.emphasized[disabled]:hover, .jewel.button.emphasized[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.emphasized.outlined {
   background: rgba(140, 198, 60, 0.05);
@@ -1984,6 +2017,9 @@ a:active {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.emphasized.outlined[disabled]:hover, .jewel.button.emphasized.outlined[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.button.emphasized.unboxed {
   background: rgba(140, 198, 60, 0);
@@ -2015,6 +2051,9 @@ a:active {
   color: silver;
   text-shadow: unset;
 }
+.jewel.button.emphasized.unboxed[disabled]:hover, .jewel.button.emphasized.unboxed[disabled]:hover:focus {
+  color: silver;
+}
 
 .jewel.datagrid .jewel.list.column .jewel.item.datagrid.emphasized.hovered {
   background: #a8d46b;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass b/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
index d1398f9..c10c97f 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
@@ -146,6 +146,10 @@
 		color: $disabled-font-color
 		text-shadow: unset
 
+		&:hover, &:hover:focus
+			color: $disabled-font-color
+
+
 =togglebutton-theme($togglebutton-color, $text-color, $outlined: false, $unboxed: false)
 	
 	+jewel-bg-border("normal", $togglebutton-color, $outlined, $unboxed, $togglebutton-border-radius)