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 fe0d0df togglebutton separate fonticon styles
fe0d0df is described below
commit fe0d0dfd31db18bb96e2c52bd786d9aae17929c8
Author: Carlos Rovira <[email protected]>
AuthorDate: Mon Jul 9 23:47:58 2018 +0200
togglebutton separate fonticon styles
---
.../projects/Jewel/src/main/resources/defaults.css | 4 ---
.../src/main/sass/components/_togglebutton.sass | 4 ---
.../JewelTheme/src/main/resources/defaults.css | 5 +++
.../sass/components-primary}/_togglebutton.sass | 37 +---------------------
.../themes/JewelTheme/src/main/sass/defaults.sass | 1 +
5 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index c810823..5ad8fda 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -2736,10 +2736,6 @@ j|TitleBar {
.jewel.togglebutton[disabled] {
cursor: unset;
}
-.jewel.togglebutton .icon {
- margin-left: 0px;
- margin-right: 8px;
-}
.jewel.topappbar {
display: inline-flex;
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
b/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
index 42825b4..cc129ce 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
@@ -52,10 +52,6 @@ $button-padding: 0.72em 1.12em !default
&[disabled]
cursor: unset
- .icon
- margin-left: 0px
- margin-right: 8px
-
@media -royale-swf
j|ToggleTextButton
//IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.ToggleButtonModel")
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 328cd68..8687337 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -584,6 +584,11 @@ j|Card {
padding-right: 0;
}
+.jewel.togglebutton .fonticon {
+ margin-left: 0px;
+ margin-right: 8px;
+}
+
.jewel.button.secondary {
background: linear-gradient(#f16c42, #ed4812);
border: 1px solid #be390e;
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_togglebutton.sass
similarity index 58%
copy from frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
copy to
frameworks/themes/JewelTheme/src/main/sass/components-primary/_togglebutton.sass
index 42825b4..a812ead 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_togglebutton.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_togglebutton.sass
@@ -20,43 +20,8 @@
// Jewel Button
// Button variables
-$button-margin: 0 !default
-$button-padding: 0.72em 1.12em !default
.jewel.togglebutton
- margin: $button-margin
- padding: $button-padding
-
- cursor: pointer
- user-select: none
-
- display: inline-flex
- position: relative
- align-items: center
- justify-content: center
- zoom: 1
- vertical-align: middle
- overflow: hidden
- outline: none
-
- // -- BUTTON LABEL
- white-space: nowrap
- line-height: normal !important
-
- text:
- align: center
- decoration: none
-
- // &:focus
-
- &[disabled]
- cursor: unset
-
- .icon
+ .fonticon
margin-left: 0px
margin-right: 8px
-
-@media -royale-swf
- j|ToggleTextButton
- //IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.ToggleButtonModel")
- //IBeadView:
ClassReference("org.apache.royale.html.beads.CSSTextToggleButtonView")
diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
index 3c792ef..a386b05 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
@@ -43,6 +43,7 @@
@import "components-primary/textinput"
@import "components-primary/titlebar"
@import "components-primary/topappbar"
+@import "components-primary/togglebutton"
@import "components-secondary/alert"
@import "components-secondary/button"
