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 51a3c91 jewel button: fix styles when is normal and disabled
51a3c91 is described below
commit 51a3c91f425b9539403d24f9f4364d68f0c7949d
Author: Carlos Rovira <[email protected]>
AuthorDate: Mon Feb 18 13:49:17 2019 +0100
jewel button: fix styles when is normal and disabled
---
.../src/main/royale/ButtonPlayGround.mxml | 10 +++++
.../JewelTheme/src/main/resources/defaults.css | 48 +++++++++++-----------
.../themes/JewelTheme/src/main/sass/_mixins.sass | 10 ++---
3 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
index 545f133..c41c37a 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
@@ -48,6 +48,11 @@ limitations under the License.
<html:H3 text="Jewel Button"/>
<j:Button text="Default" id="button"
click="clickHandler(event)"/>
+ <j:Button text="Disabled">
+ <j:beads>
+ <j:Disabled/>
+ </j:beads>
+ </j:Button>
<j:Button text="Button With More Text"/>
<j:Button text="Primary"
emphasis="{Button.PRIMARY}"/>
<j:Button text="Secondary"
emphasis="{Button.SECONDARY}"/>
@@ -124,6 +129,11 @@ limitations under the License.
<html:H3 text="Jewel ToggleButton"/>
<j:ToggleButton text="Default"/>
+ <j:ToggleButton text="Disabled">
+ <j:beads>
+ <j:Disabled/>
+ </j:beads>
+ </j:ToggleButton>
<j:ToggleButton text="Button With More Text"/>
<j:ToggleButton text="Primary"
emphasis="{Button.PRIMARY}"/>
<j:ToggleButton text="Secondary"
emphasis="{Button.SECONDARY}"/>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 7542f2a..c53584b 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -175,9 +175,9 @@ hr {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
@@ -215,9 +215,9 @@ hr {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.primary[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
@@ -949,9 +949,9 @@ a:active {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.togglebutton[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
@@ -994,9 +994,9 @@ a:active {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.togglebutton.primary[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
@@ -1116,9 +1116,9 @@ j|Wizard {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.secondary[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
@@ -1173,9 +1173,9 @@ a:active {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.togglebutton.secondary[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
@@ -1212,9 +1212,9 @@ a:active {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.emphasized[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
@@ -1257,9 +1257,9 @@ a:active {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.togglebutton.emphasized[disabled] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
+ background: #f3f3f3 !important;
+ border: 1px solid #d9d9d9 !important;
+ box-shadow: none !important;
color: silver;
text-shadow: unset;
}
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
b/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
index 85ff79c..ef2d156 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
@@ -55,9 +55,9 @@
@else if ($state == "disabled")
@if $flat
- background: $disabled-color
- border: 0px solid
+ background: $disabled-color !important
+ border: 0px solid !important
@else
- background: $disabled-color
- border: 1px solid $disabled-border-color
- box-shadow: none
+ background: $disabled-color !important
+ border: 1px solid $disabled-border-color !important
+ box-shadow: none !important
