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 bb05b45 jewel-buttons: fix buttons sizes when using icons and pass
padding to theme part
bb05b45 is described below
commit bb05b450fa3e10ee9c3e383a46cf34b7c709b93f
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Feb 23 13:58:59 2020 +0100
jewel-buttons: fix buttons sizes when using icons and pass padding to theme
part
---
.../projects/Jewel/src/main/sass/components/_button.sass | 5 -----
.../Jewel/src/main/sass/components/_togglebutton.sass | 5 -----
.../JewelTheme/src/main/sass/components-primary/_button.sass | 12 ++++++++++--
.../src/main/sass/components-primary/_togglebutton.sass | 12 ++++++++++--
4 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_button.sass
b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
index bdd0d87..90f4b0e 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_button.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
@@ -20,13 +20,8 @@
// Jewel Button
// Button variables
-$button-margin: 0 !default
-$button-padding: 0.68em 1.12em !default
.jewel.button
- margin: $button-margin
- padding: $button-padding
-
cursor: pointer
user-select: none
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
b/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
index 30cf93c..443db09 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
@@ -20,13 +20,8 @@
// Jewel ToggleButton
// ToggleButton variables
-$togglebutton-margin: 0 !default
-$togglebutton-padding: 0.68em 1.12em !default
.jewel.togglebutton
- margin: $togglebutton-margin
- padding: $togglebutton-padding
-
cursor: pointer
user-select: none
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
index a1732d6..4ddab3f 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
@@ -20,6 +20,9 @@
// Jewel Button
// Button variables
+$button-margin: 0 !default
+$button-padding: 0.679em 1.12em !default
+$icon-button-padding: 0.429em 0.87em !default
$button-border-radius: $border-radius
=button-theme($button-color, $text-color)
@@ -48,6 +51,9 @@ $button-border-radius: $border-radius
text-shadow: unset
.jewel.button
+ margin: $button-margin
+ padding: $button-padding
+
+button-theme($default-color, $default-font-color)
// -- BUTTON LABEL
@@ -67,15 +73,17 @@ $button-border-radius: $border-radius
weight: $font-weight-normal
&.icon
+ padding: $icon-button-padding
+
i
margin-left: 0px
margin-right: 0px
- &.iconLSpace
+ &.left-space
i
margin-left: 0px
margin-right: 8px
- &.iconRSpace
+ &.right-space
i
margin-left: 8px
margin-right: 0px
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_togglebutton.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_togglebutton.sass
index 7e52071..c90d613 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_togglebutton.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_togglebutton.sass
@@ -20,6 +20,9 @@
// Jewel ToggleButton
// ToggleButton variables
+$togglebutton-margin: 0 !default
+$togglebutton-padding: 0.679em 1.12em !default
+$icon-togglebutton-padding: 0.429em 0.87em !default
$togglebutton-border-radius: $border-radius
=togglebutton-theme($togglebutton-color, $text-color)
@@ -51,6 +54,9 @@ $togglebutton-border-radius: $border-radius
+jewel-bg-border("selected", $togglebutton-color)
.jewel.togglebutton
+ margin: $togglebutton-margin
+ padding: $togglebutton-padding
+
+togglebutton-theme($default-color, $default-font-color)
@@ -71,15 +77,17 @@ $togglebutton-border-radius: $border-radius
weight: $font-weight-normal
&.icon
+ padding: $icon-button-padding
+
i
margin-left: 0px
margin-right: 0px
- &.iconLSpace
+ &.left-space
i
margin-left: 0px
margin-right: 8px
- &.iconRSpace
+ &.right-space
i
margin-left: 8px
margin-right: 0px
