This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/jewel-ui-set by this
push:
new d33b0e3 fix check and radio disabled label state and some cleaning
d33b0e3 is described below
commit d33b0e3b22375201a3e6d4c87dd615c0e95e223e
Author: Carlos Rovira <[email protected]>
AuthorDate: Wed Mar 28 09:15:45 2018 +0200
fix check and radio disabled label state and some cleaning
---
frameworks/themes/JewelTheme/src/main/resources/defaults.css | 6 ++++--
.../JewelTheme/src/main/sass/components/_checkbox.sass | 12 +++---------
.../JewelTheme/src/main/sass/components/_radiobutton.sass | 5 ++---
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 1609244..f3f5495 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -226,7 +226,8 @@ div {
border: 1px solid #c6c6c6;
background: #F9F9F9;
}
-.jewel.checkbox input[disabled] + .span {
+.jewel.checkbox input[disabled] + span {
+ cursor: unset;
color: #c6c6c6;
}
.jewel.checkbox input[disabled]:checked {
@@ -292,7 +293,8 @@ div {
border: 1px solid #c6c6c6;
background: #F9F9F9;
}
-.jewel.radiobutton input[disabled] + .span {
+.jewel.radiobutton input[disabled] + span {
+ cursor: unset;
color: #c6c6c6;
}
.jewel.radiobutton input[disabled]:checked {
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass
b/frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass
index ea1830e..5c29a1a 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass
@@ -61,15 +61,11 @@ $checkbox-label-font-size: 16px
border-radius: $checkbox-border-radius
&:checked, &:checked:active
- //background: url(assets/checkbox-tick.svg),
lighten($primary-color, 25%)
background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 16 13'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-763,
-290)'><g transform='translate(760, 285)'><g><polygon fill='#{$primary-color}'
points='3 13 9 18 19 7 16 5 9 13 6 10'></polygon></g></g></g></svg>"),
lighten($primary-color, 25%)
background-repeat: no-repeat
background-size: 90%
background-position: center
background-attachment: fixed
- //z-index: -10
- //box-shadow: inset 0px 0px 0px 3px $disabled-color
- //fill: $primary-color
// @if $flat
// background: lighten($primary-color, 25%)
// @else
@@ -87,20 +83,18 @@ $checkbox-label-font-size: 16px
border: 1px solid darken($disabled-color, 20%)
background: $disabled-color
- & + .span
+ & + span
+ cursor: unset
color: darken($disabled-color, 20%)
&:checked
border: 1px solid darken($disabled-color, 20%)
- //background: url(assets/checkbox-tick.svg), $disabled-color
background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 16
13' version='1.1' xmlns='http://www.w3.org/2000/svg'><g
transform='translate(-763, -290)'><g transform='translate(760,
285)'><g><polygon fill='#{darken($disabled-color, 15%)}' points='3 13 9 18 19 7
16 5 9 13 6 10'></polygon></g></g></g></svg>"), $disabled-color
background-size: 90%
background-position: center
background-repeat: no-repeat
background-attachment: fixed
- //background: $disabled-color url(data:image/svg+xml;utf8,<svg
viewBox='0 0 16 13' version='1.1' xmlns='http://www.w3.org/2000/svg'><g
transform='translate(-763, -290)'><g transform='translate(760,
285)'><g><polygon fill='#{darken($disabled-color, 15%)}' points='3 13 9 18 19 7
16 5 9 13 6 10'></polygon></g></g></g></svg>) no-repeat fixed center/90%
- //background: $disabled-color
-
+
// -- LABEL
span
cursor: pointer
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass
b/frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass
index 72139b4..9aca4f6 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass
@@ -61,7 +61,6 @@ $radiobutton-label-font-size: 16px
border-radius: $radiobutton-border-radius
&:checked, &:checked:active
- //background: url(assets/radiobutton-tick.svg),
lighten($primary-color, 25%)
background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 12 12'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-616,
-350)'><g transform='translate(611, 345)'><g><circle fill='#{$primary-color}'
cx='11' cy='11' r='6'></circle></g></g></g></svg>"), lighten($primary-color,
25%)
background-repeat: no-repeat
background-size: 60%
@@ -80,12 +79,12 @@ $radiobutton-label-font-size: 16px
border: 1px solid darken($disabled-color, 20%)
background: $disabled-color
- & + .span
+ & + span
+ cursor: unset
color: darken($disabled-color, 20%)
&:checked
border: 1px solid darken($disabled-color, 20%)
- //background: url(assets/radiobutton-tick.svg), $disabled-color
background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 12
12' version='1.1' xmlns='http://www.w3.org/2000/svg'><g
transform='translate(-616, -350)'><g transform='translate(611, 345)'><g><circle
fill='#{darken($disabled-color, 15%)}' cx='11' cy='11'
r='6'></circle></g></g></g></svg>"), $disabled-color
background-size: 60%
background-position: center
--
To stop receiving notification emails like this one, please contact
[email protected].
