You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/06/15 17:23:53 UTC
[royale-asjs] 07/08: jewel-button: padding between text and icon is
now applied to text instead to icon
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
commit 3114904aff61dba5f276a89894744731b39d3d5c
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Jun 15 19:22:36 2020 +0200
jewel-button: padding between text and icon is now applied to text instead to icon
---
frameworks/themes/JewelTheme/src/main/resources/defaults.css | 12 ++++++------
.../JewelTheme/src/main/sass/components-primary/_button.sass | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index a650c2e..ab15272 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -175,18 +175,18 @@ hr {
.jewel.button.icon {
padding: 0.429em 0.87em;
}
-.jewel.button.icon i {
+.jewel.button.icon span {
margin-left: 0px;
margin-right: 0px;
}
-.jewel.button.left-space i {
- margin-left: 0px;
- margin-right: 8px;
-}
-.jewel.button.right-space i {
+.jewel.button.left-space span {
margin-left: 8px;
margin-right: 0px;
}
+.jewel.button.right-space span {
+ margin-left: 0px;
+ margin-right: 8px;
+}
.jewel.button.primary {
background: linear-gradient(#54b7f3, #24a3ef);
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 b6ec063..4da9f70 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
@@ -49,18 +49,18 @@ $button-border-radius: $border-radius
&.icon
padding: $icon-button-padding
- i
+ span
margin-left: 0px
margin-right: 0px
&.left-space
- i
- margin-left: 0px
- margin-right: 8px
- &.right-space
- i
+ span
margin-left: 8px
margin-right: 0px
+ &.right-space
+ span
+ margin-left: 0px
+ margin-right: 8px
.jewel.button.primary
+button-theme($primary-color, $font-theme-color)