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
commit ea8b44ece1fb5848d25639ae387a457cdf1c2f08 Author: Carlos Rovira <[email protected]> AuthorDate: Mon Mar 19 17:10:05 2018 +0100 some minor changes --- .../royale/org/apache/royale/jewel/TextField.as | 4 +- .../src/main/sass/components/_button.sass | 3 -- .../components/{_textbutton.sass => _check.sass} | 46 +--------------------- .../components/{_textbutton.sass => _radio.sass} | 46 +--------------------- .../components/{_textbutton.sass => _slider.sass} | 46 +--------------------- .../src/main/sass/components/_textbutton.sass | 7 +--- .../themes/JewelTheme/src/main/sass/defaults.sass | 5 ++- 7 files changed, 11 insertions(+), 146 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextField.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextField.as index 69af720..6bd9f01 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextField.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TextField.as @@ -89,14 +89,14 @@ package org.apache.royale.jewel input = addElementToWrapper(this,'input') as HTMLInputElement; input.setAttribute('type', 'text'); - input.className = "vTextField--input"; + //input.className = "vTextField--input"; //attach input handler to dispatch royale change event when user write in textinput //goog.events.listen(element, 'change', killChangeHandler); goog.events.listen(input, 'input', textChangeHandler); label = document.createElement('label') as HTMLLabelElement; - label.className = "vTextField--label"; + //label.className = "vTextField--label"; textNode = document.createTextNode('') as Text; label.appendChild(textNode); diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass index d04d186..f8c5952 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass @@ -17,9 +17,6 @@ // //////////////////////////////////////////////////////////////////////////////// -/** - * Jewel Button - */ %button-def cursor: pointer diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_check.sass similarity index 52% copy from frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass copy to frameworks/themes/JewelTheme/src/main/sass/components/_check.sass index b02123a..7608f63 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components/_check.sass @@ -16,49 +16,5 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// - -/** - * Jewel TextButton - */ -%textbutton-def - @extend %button-def - /* TextField */ - font: - family: $font-stack - style: bold - size: $font-size - //+trans(0.2s ease-in-out) - text: - transform: uppercase - decoration: none - //shadow: 0 .063em rgba(black,.3) - [disabled] - text: - shadow: unset - -.jewel.textbutton, .jewel.textbutton:hover - @extend %textbutton-def - -.jewel.textbutton - +button-theme($default-color, $default-font-color) - -.jewel.textbutton.primary - +button-theme($primary-color, $font-color) - -.jewel.textbutton.secondary - +button-theme($secondary-color, $font-color) - -.jewel.textbutton.emphasized - +button-theme($emphasized-color, $font-color) - -// /* TextField: */ -// font-family: $font-stack -// font-size: 14px -// font-weight: bold -// color: $font-normal-color -// text-shadow: 0 1px 0 #555 - -// padding: 10px 0px -// display: inline-block -// min-width: 80px +.jewel.check \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_radio.sass similarity index 52% copy from frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass copy to frameworks/themes/JewelTheme/src/main/sass/components/_radio.sass index b02123a..689f939 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components/_radio.sass @@ -16,49 +16,5 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// - -/** - * Jewel TextButton - */ -%textbutton-def - @extend %button-def - /* TextField */ - font: - family: $font-stack - style: bold - size: $font-size - //+trans(0.2s ease-in-out) - text: - transform: uppercase - decoration: none - //shadow: 0 .063em rgba(black,.3) - [disabled] - text: - shadow: unset - -.jewel.textbutton, .jewel.textbutton:hover - @extend %textbutton-def - -.jewel.textbutton - +button-theme($default-color, $default-font-color) - -.jewel.textbutton.primary - +button-theme($primary-color, $font-color) - -.jewel.textbutton.secondary - +button-theme($secondary-color, $font-color) - -.jewel.textbutton.emphasized - +button-theme($emphasized-color, $font-color) - -// /* TextField: */ -// font-family: $font-stack -// font-size: 14px -// font-weight: bold -// color: $font-normal-color -// text-shadow: 0 1px 0 #555 - -// padding: 10px 0px -// display: inline-block -// min-width: 80px +.jewel.radio \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_slider.sass similarity index 52% copy from frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass copy to frameworks/themes/JewelTheme/src/main/sass/components/_slider.sass index b02123a..1d72a04 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components/_slider.sass @@ -16,49 +16,5 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// - -/** - * Jewel TextButton - */ -%textbutton-def - @extend %button-def - /* TextField */ - font: - family: $font-stack - style: bold - size: $font-size - //+trans(0.2s ease-in-out) - text: - transform: uppercase - decoration: none - //shadow: 0 .063em rgba(black,.3) - [disabled] - text: - shadow: unset - -.jewel.textbutton, .jewel.textbutton:hover - @extend %textbutton-def - -.jewel.textbutton - +button-theme($default-color, $default-font-color) - -.jewel.textbutton.primary - +button-theme($primary-color, $font-color) - -.jewel.textbutton.secondary - +button-theme($secondary-color, $font-color) - -.jewel.textbutton.emphasized - +button-theme($emphasized-color, $font-color) - -// /* TextField: */ -// font-family: $font-stack -// font-size: 14px -// font-weight: bold -// color: $font-normal-color -// text-shadow: 0 1px 0 #555 - -// padding: 10px 0px -// display: inline-block -// min-width: 80px +.jewel.slider \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass index b02123a..eb82343 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass @@ -16,10 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// - -/** - * Jewel TextButton - */ + %textbutton-def @extend %button-def /* TextField */ @@ -31,7 +28,7 @@ text: transform: uppercase decoration: none - //shadow: 0 .063em rgba(black,.3) + //shadow: 0 -1px 0 rgba(0,0,0,0.70) //0 .063em [disabled] text: shadow: unset diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass index b3bd62e..7ecc056 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass @@ -26,6 +26,9 @@ // Components @import "components/button" -@import "components/textbutton" +@import "components/check" @import "components/label" +@import "components/radio" +@import "components/slider" +@import "components/textbutton" @import "components/textfield" -- To stop receiving notification emails like this one, please contact [email protected].
