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 a83c690 some cleaning and minor fixes
a83c690 is described below
commit a83c6903eea2a3395755fcbbd526064a85596ec1
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Sat Jun 16 14:52:25 2018 +0200
some cleaning and minor fixes
---
.../JewelExample/src/main/royale/TextInputPlayGround.mxml | 4 ++--
.../projects/Jewel/src/main/sass/components/_button.sass | 5 -----
.../projects/Jewel/src/main/sass/components/_textinput.sass | 1 -
frameworks/themes/JewelTheme/src/main/resources/defaults.css | 8 ++++----
frameworks/themes/JewelTheme/src/main/sass/_mixins.sass | 12 ++++++------
frameworks/themes/JewelTheme/src/main/sass/_variables.sass | 2 ++
.../JewelTheme/src/main/sass/components-primary/_button.sass | 8 ++------
.../src/main/sass/components-primary/_textinput.sass | 8 ++++----
8 files changed, 20 insertions(+), 28 deletions(-)
diff --git
a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
index 09bf857..2d64568 100644
--- a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
@@ -28,7 +28,7 @@ limitations under the License.
<j:beads>
<j:HorizontalLayout gap="10"/>
</j:beads>
- <j:Button text="Check it!" emphasis="{Button.PRIMARY}"/>
+ <j:Button text="Check it!" emphasis="primary"/>
<j:TextInput text="A TextInput"/>
</j:Group>
@@ -41,7 +41,7 @@ limitations under the License.
<j:TextPrompt prompt="With prompt..."/>
</j:beads>
</j:TextInput>
- <j:Button text="Send" emphasis="{Button.PRIMARY}"/>
+ <j:Button text="Send" emphasis="secondary"/>
</j:Group>
<j:TextInput text="Disabled with text...">
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_button.sass
b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
index 368d4a0..f8a1485 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_button.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
@@ -22,16 +22,11 @@
// Button variables
$button-margin: 0 !default
$button-padding: 0.72em 1.12em !default
-// $button-min-height: 28px !default
-// $button-min-width: 74px !default
.jewel.button
margin: $button-margin
padding: $button-padding
- // min-width: $button-min-width
- // min-height: $button-min-height
-
cursor: pointer
user-select: none
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_textinput.sass
b/frameworks/projects/Jewel/src/main/sass/components/_textinput.sass
index 5ee05bd..4046656 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_textinput.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_textinput.sass
@@ -50,7 +50,6 @@ j|TextInput
//IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.EditableTextKeyboardController")
-
// Jewel TextArea
// TextArea variables
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 80366a9..22f5a20 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -125,7 +125,7 @@ div {
background: linear-gradient(#e6e6e6, #cccccc);
border: 1px solid #b3b3b3;
box-shadow: inset 0 1px 0 white;
- border-radius: 3px;
+ border-radius: 0.25rem;
color: #808080;
font-family: "Lato", sans-serif;
font-weight: bold;
@@ -159,7 +159,7 @@ div {
background: linear-gradient(#54b7f3, #24a3ef);
border: 1px solid #0f88d1;
box-shadow: inset 0 1px 0 #9bd5f8;
- border-radius: 3px;
+ border-radius: 0.25rem;
color: #FFFFFF;
text-shadow: 0 -1px 0 rgba(10, 90, 138, 0.7);
}
@@ -420,7 +420,7 @@ j|Card {
.jewel.textinput > input {
background: linear-gradient(white, #f3f3f3);
border: 1px solid #b3b3b3;
- border-radius: 3px;
+ border-radius: 0.25rem;
transition-duration: 0.3s;
transition-timing-function: easein;
}
@@ -450,7 +450,7 @@ j|Card {
.jewel.textarea > textarea {
background: linear-gradient(white, #f3f3f3);
border: 1px solid #b3b3b3;
- border-radius: 3px;
+ border-radius: 0.25rem;
transition-duration: 0.3s;
transition-timing-function: easein;
}
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
b/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
index 9f291c9..c309e2c 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_mixins.sass
@@ -17,16 +17,16 @@
//
////////////////////////////////////////////////////////////////////////////////
-=jewel-bg-border($state, $bg-color, $border-radius: 0px)
+=jewel-bg-border($state, $bg-color, $bg-border-radius: 0px)
@if ($state == "normal")
@if $flat
background: $bg-color
border: 0px solid
@else
background: linear-gradient(lighten($bg-color, 5%),
darken($bg-color, 5%))
- border: 1px solid darken($bg-color, 15%)// .094em
+ border: 1px solid darken($bg-color, 15%)
box-shadow: inset 0 1px 0 lighten($bg-color, 20%)
- border-radius: $border-radius //.625em
+ border-radius: $bg-border-radius
@else if ($state == "hover")
@if $flat
@@ -34,7 +34,7 @@
border: 0px solid
@else
background: linear-gradient($bg-color,
darken($bg-color, 10%))
- border: 1px solid darken($bg-color, 20%)// .094em
+ border: 1px solid darken($bg-color, 20%)
@else if ($state == "active")
@if $flat
@@ -42,7 +42,7 @@
border: 0px solid
@else
background: linear-gradient(darken($bg-color, 10%),
darken($bg-color, 20%))
- border: 1px solid darken($bg-color, 30%)// .094em
+ border: 1px solid darken($bg-color, 30%)
box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5)
@else if ($state == "focus")
@@ -59,5 +59,5 @@
border: 0px solid
@else
background: $disabled-color
- border: 1px solid $disabled-border-color// .094em
+ border: 1px solid $disabled-border-color
box-shadow: none
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
index 7445885..27b82fd 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
@@ -34,6 +34,8 @@ $font-size-large: 1.2em
$font-size-xlarge: 1.4em
// VARIABLES
+$border-radius: .25rem
+
$default-color: $light-color
@if $dark
$default-color: $dark-color
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 d4dc2dc..bcbb129 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
@@ -20,11 +20,7 @@
// Jewel Button
// Button variables
-// $button-margin: 0 !default
-// $button-padding: 0.72em 1.12em !default
-// $button-min-height: 28px !default
-// $button-min-width: 74px !default
-$button-border-radius: 3px
+$button-border-radius: $border-radius
=button-theme($button-color, $text-color)
@@ -34,7 +30,7 @@ $button-border-radius: 3px
@if not $flat and $text-color == $font-theme-color
text:
- shadow: 0 -1px 0 rgba(darken($button-color, 30%), .7)
//0 .063em
+ shadow: 0 -1px 0 rgba(darken($button-color, 30%), .7)
&:hover, &:hover:focus
+jewel-bg-border("hover", $button-color)
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textinput.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textinput.sass
index 00a8fb2..30e8e1b 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textinput.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textinput.sass
@@ -20,7 +20,7 @@
// Jewel TextInput
// TextInput variables
-$textinput-border-radius: 3px
+$textinput-border-radius: $border-radius
=textinput-theme($textinput-text-color)
@@ -58,7 +58,7 @@ $textinput-border-radius: 3px
border: 0px solid
@else
background: $disabled-color
- border: 1px solid $disabled-border-color//
.094em
+ border: 1px solid $disabled-border-color
box-shadow: none
color: $disabled-font-color
@@ -81,7 +81,7 @@ $textinput-border-radius: 3px
// Jewel TextArea
// TextArea variables
-$textarea-border-radius: 3px
+$textarea-border-radius: $border-radius
=textarea-theme($textarea-text-color)
@@ -119,7 +119,7 @@ $textarea-border-radius: 3px
border: 0px solid
@else
background: $disabled-color
- border: 1px solid $disabled-border-color//
.094em
+ border: 1px solid $disabled-border-color
box-shadow: none
color: $disabled-font-color
--
To stop receiving notification emails like this one, please contact
carlosrov...@apache.org.
