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
The following commit(s) were added to refs/heads/feature/jewel-ui-set by this push: new a97b42a some tweaks a97b42a is described below commit a97b42abad7f2c5b468567674f0e04a87b12939a Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Mon Apr 2 00:32:17 2018 +0200 some tweaks --- .../src/main/royale/AlertPlayGround.mxml | 4 +- .../src/main/royale/HeadingsAndText.mxml | 2 +- .../src/main/sass/components/_checkbox.sass | 83 ---------------------- .../src/main/sass/components/_radiobutton.sass | 79 -------------------- .../themes/JewelTheme/src/main/sass/_global.sass | 4 -- 5 files changed, 3 insertions(+), 169 deletions(-) diff --git a/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml index 33a5a63..5c66d3c 100644 --- a/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml +++ b/examples/royale/JewelExample/src/main/royale/AlertPlayGround.mxml @@ -52,10 +52,10 @@ limitations under the License. <html:H3 text="Jewel Alert"/> - <html:Div text="Click the button below to display a simple Alert window"/> + <js:MultilineLabel text="Click the button below to display a simple Alert window"/> <j:TextButton text="Click Me" click="Alert.show('This is an Alert component example that shows a label text and the default OK button.', 'Alert Example')"/> - <html:Div text="Click the button below to display an Alert window and capture the button pressed by the user."/> + <js:MultilineLabel text="Click the button below to display an Alert window and capture the button pressed by the user."/> <j:TextButton text="Click Me" click="clickHandler(event)"/> <j:Label id="status"/> diff --git a/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml b/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml index d594508..df264c9 100644 --- a/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml +++ b/examples/royale/JewelExample/src/main/royale/HeadingsAndText.mxml @@ -36,6 +36,6 @@ limitations under the License. <html:Span text="Some span text."/> - <html:Div text="Normal text used in a div, texts and fields with single line or multiple lines."/> + <js:MultilineLabel text="Normal text used in a div, texts and fields with single line or multiple lines."/> </js:Group> diff --git a/frameworks/themes/JewelBlueTheme/src/main/sass/components/_checkbox.sass b/frameworks/themes/JewelBlueTheme/src/main/sass/components/_checkbox.sass index a52e126..9b0ac58 100644 --- a/frameworks/themes/JewelBlueTheme/src/main/sass/components/_checkbox.sass +++ b/frameworks/themes/JewelBlueTheme/src/main/sass/components/_checkbox.sass @@ -20,86 +20,3 @@ // Jewel CheckBox // CheckBox variables -$checkbox-button-size: 22px -$checkbox-border-radius: 3px -$checkbox-label-separation: 6px -$checkbox-label-font-size: 16px - -.jewel.checkbox - //cursor: pointer - display: inline-block - - margin: 0 - padding: 0 - - position: relative - vertical-align: middle - - width: 100% - height: $checkbox-button-size - - // -- INPUT - input - +appear(none) - cursor: pointer - display: inline-block - - margin: 0 - padding: 0 - - width: $checkbox-button-size - height: $checkbox-button-size - - line-height: $checkbox-button-size - - @if $flat - border: 0px solid - background: $default-color - @else - background: linear-gradient(lighten($default-color, 15%), lighten($default-color, 10%)) - border: 1px solid darken($default-color, 15%) - border-radius: $checkbox-border-radius - - &:checked, &:checked:active - background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 16 13' version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-763, -290)'><g transform='translate(760, 285)'><polygon fill='#{$primary-color}' points='3 13 9 18 19 7 16 5 9 13 6 10'></polygon></g></g></svg>"), lighten($primary-color, 25%) - background-repeat: no-repeat - background-size: 90% - background-position: center - background-attachment: fixed - // @if $flat - // background: lighten($primary-color, 25%) - // @else - // border: 1px solid darken($primary-color, 15%) - - &:focus - outline: none - @if $flat - background: lighten($primary-color, 25%) - @else - border: 1px solid darken($primary-color, 15%) - - &[disabled] - cursor: unset - border: 1px solid darken($disabled-color, 20%) - background: $disabled-color - - & + span - cursor: unset - color: darken($disabled-color, 20%) - - &:checked - border: 1px solid darken($disabled-color, 20%) - background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 16 13' version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-763, -290)'><g transform='translate(760, 285)'><polygon fill='#{darken($disabled-color, 15%)}' points='3 13 9 18 19 7 16 5 9 13 6 10'></polygon></g></g></svg>"), $disabled-color - background-size: 90% - background-position: center - background-repeat: no-repeat - background-attachment: fixed - - // -- LABEL - span - cursor: pointer - position: absolute - margin: 0 - padding-left: $checkbox-label-separation - font-size: $checkbox-label-font-size - line-height: $checkbox-button-size diff --git a/frameworks/themes/JewelBlueTheme/src/main/sass/components/_radiobutton.sass b/frameworks/themes/JewelBlueTheme/src/main/sass/components/_radiobutton.sass index a7b4ff0..9016e3a 100644 --- a/frameworks/themes/JewelBlueTheme/src/main/sass/components/_radiobutton.sass +++ b/frameworks/themes/JewelBlueTheme/src/main/sass/components/_radiobutton.sass @@ -20,82 +20,3 @@ // Jewel RadioButton // RadioButton variables -$radiobutton-button-size: 22px -$radiobutton-border-radius: 50% -$radiobutton-label-separation: 6px -$radiobutton-label-font-size: 16px - -.jewel.radiobutton - //cursor: pointer - display: inline-block - - margin: 0 - padding: 0 - - position: relative - vertical-align: middle - - width: 100% - height: $radiobutton-button-size - - // -- INPUT - input - +appear(none) - cursor: pointer - display: inline-block - - margin: 0 - padding: 0 - - width: $radiobutton-button-size - height: $radiobutton-button-size - - line-height: $radiobutton-button-size - - @if $flat - border: 0px solid - background: $default-color - @else - background: linear-gradient(lighten($default-color, 15%), lighten($default-color, 10%)) - border: 1px solid darken($default-color, 15%) - border-radius: $radiobutton-border-radius - - &:checked, &:checked:active - background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 12 12' version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-616, -350)'><g transform='translate(611, 345)'><circle fill='#{$primary-color}' cx='11' cy='11' r='6'></circle></g></g></svg>"), lighten($primary-color, 25%) - background-repeat: no-repeat - background-size: 60% - background-position: center - background-attachment: fixed - - &:focus - outline: none - @if $flat - background: lighten($primary-color, 25%) - @else - border: 1px solid darken($primary-color, 15%) - - &[disabled] - cursor: unset - border: 1px solid darken($disabled-color, 20%) - background: $disabled-color - - & + span - cursor: unset - color: darken($disabled-color, 20%) - - &:checked - border: 1px solid darken($disabled-color, 20%) - background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 12 12' version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-616, -350)'><g transform='translate(611, 345)'><circle fill='#{darken($disabled-color, 15%)}' cx='11' cy='11' r='6'></circle></g></g></svg>"), $disabled-color - background-size: 60% - background-position: center - background-repeat: no-repeat - background-attachment: fixed - - // -- LABEL - span - cursor: pointer - position: absolute - margin: 0 - padding-left: $radiobutton-label-separation - font-size: $radiobutton-label-font-size - line-height: $radiobutton-button-size diff --git a/frameworks/themes/JewelTheme/src/main/sass/_global.sass b/frameworks/themes/JewelTheme/src/main/sass/_global.sass index f0a1623..f0ea008 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/_global.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/_global.sass @@ -22,8 +22,6 @@ .royale *, .royale *:before, .royale *:after - -moz-box-sizing: border-box - -webkit-box-sizing: border-box box-sizing: border-box j|Application @@ -48,5 +46,3 @@ span div font-size: 14px - white-space: normal - word-wrap: break-word -- To stop receiving notification emails like this one, please contact carlosrov...@apache.org.