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 c61a242 fix textarea text size and rename Size bead to SizeControl to
avoid name conflicts when referencing constants
c61a242 is described below
commit c61a2421cfd8f884554c4ede3a77b36a6d355e6c
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Sat Jun 16 14:29:25 2018 +0200
fix textarea text size and rename Size bead to SizeControl to avoid name
conflicts when referencing constants
---
.../src/main/royale/ButtonPlayGround.mxml | 8 ++---
.../src/main/royale/TextInputPlayGround.mxml | 42 +++++++++++-----------
.../projects/Jewel/src/main/resources/defaults.css | 2 +-
.../Jewel/src/main/resources/jewel-manifest.xml | 2 +-
.../beads/controls/{Size.as => SizeControl.as} | 6 ++--
.../projects/Jewel/src/main/sass/_global.sass | 2 +-
.../JewelTheme/src/main/resources/defaults.css | 40 ++++++++++-----------
.../main/sass/components-primary/_textinput.sass | 15 --------
8 files changed, 51 insertions(+), 66 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
b/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
index 96640fd..ae78b8b 100644
--- a/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/ButtonPlayGround.mxml
@@ -51,22 +51,22 @@ limitations under the License.
<j:Button text="xsmall">
<j:beads>
- <j:Size size="xsmall"/>
+ <j:SizeControl size="{SizeControl.XSMALL}"/>
</j:beads>
</j:Button>
<j:Button text="small" emphasis="{Button.PRIMARY}">
<j:beads>
- <j:Size size="small"/>
+ <j:SizeControl size="{SizeControl.SMALL}"/>
</j:beads>
</j:Button>
<j:Button text="large" emphasis="{Button.SECONDARY}">
<j:beads>
- <j:Size size="large"/>
+ <j:SizeControl size="{SizeControl.LARGE}"/>
</j:beads>
</j:Button>
<j:Button text="xlarge" emphasis="{Button.EMPHASIZED}">
<j:beads>
- <j:Size size="xlarge"/>
+ <j:SizeControl size="{SizeControl.XLARGE}"/>
</j:beads>
</j:Button>
diff --git
a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
index ba00839..09bf857 100644
--- a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
@@ -58,36 +58,19 @@ limitations under the License.
</j:beads>
</j:TextInput>
- <html:H3 text="Jewel TextArea"/>
-
- <j:TextArea text="A TextArea with 5 rows" rows="5"/>
-
- <j:TextArea>
- <j:beads>
- <j:TextPrompt prompt="With prompt..."/>
- </j:beads>
- </j:TextArea>
-
- <j:TextArea text="A TextArea">
- <j:beads>
- <j:TextPrompt prompt="Disabled with prompt..."/>
- <j:Disabled/>
- </j:beads>
- </j:TextArea>
-
<html:H4 text="Sizes"/>
<j:TextInput>
<j:beads>
<j:TextPrompt prompt="Size xsmall"/>
- <j:Size size="xsmall"/>
+ <j:SizeControl size="xsmall"/>
</j:beads>
</j:TextInput>
<j:TextInput>
<j:beads>
<j:TextPrompt prompt="Size small"/>
- <j:Size size="small"/>
+ <j:SizeControl size="small"/>
</j:beads>
</j:TextInput>
@@ -100,15 +83,32 @@ limitations under the License.
<j:TextInput>
<j:beads>
<j:TextPrompt prompt="Size large"/>
- <j:Size size="large"/>
+ <j:SizeControl size="large"/>
</j:beads>
</j:TextInput>
<j:TextInput>
<j:beads>
<j:TextPrompt prompt="Size xlarge"/>
- <j:Size size="xlarge"/>
+ <j:SizeControl size="xlarge"/>
</j:beads>
</j:TextInput>
+ <html:H3 text="Jewel TextArea"/>
+
+ <j:TextArea text="A TextArea with 5 rows" rows="5"/>
+
+ <j:TextArea>
+ <j:beads>
+ <j:TextPrompt prompt="With prompt..."/>
+ </j:beads>
+ </j:TextArea>
+
+ <j:TextArea text="A TextArea">
+ <j:beads>
+ <j:TextPrompt prompt="with prompt..."/>
+ <j:Disabled/>
+ </j:beads>
+ </j:TextArea>
+
</j:Card>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index df4241f..7ad6402 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -28,7 +28,7 @@ button::-moz-focus-inner {
padding: 0;
}
-button, input {
+button, input, textarea {
font-size: 100%;
}
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 1d7480b..cc3d635 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -48,7 +48,7 @@
<component id="DropDownListList"
class="org.apache.royale.jewel.supportClasses.DropDownListList"/>
<component id="Disabled"
class="org.apache.royale.jewel.beads.controls.Disabled"/>
- <component id="Size" class="org.apache.royale.jewel.beads.controls.Size"/>
+ <component id="SizeControl"
class="org.apache.royale.jewel.beads.controls.SizeControl"/>
<component id="TextPrompt"
class="org.apache.royale.jewel.beads.controls.textinput.TextPrompt"/>
<component id="PasswordInput"
class="org.apache.royale.jewel.beads.controls.textinput.PasswordInput"/>
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Size.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/SizeControl.as
similarity index 94%
rename from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Size.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/SizeControl.as
index 42715cc..6ad0c1a 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Size.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/SizeControl.as
@@ -23,14 +23,14 @@ package org.apache.royale.jewel.beads.controls
import org.apache.royale.core.StyledUIBase;
/**
- * The Size bead class is a specialty bead that can be used to size a
Jewel control.
+ * The SizeControl bead class is a specialty bead that can be used to
size a Jewel control.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class Size implements IBead
+ public class SizeControl implements IBead
{
public static const XSMALL:String = "xsmall";
public static const SMALL:String = "small";
@@ -45,7 +45,7 @@ package org.apache.royale.jewel.beads.controls
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public function Size()
+ public function SizeControl()
{
}
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass
b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 7ee8b6e..aa1458f 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -32,7 +32,7 @@
button::-moz-focus-inner
padding: 0
-button, input
+button, input, textarea
font-size: 100%
j|View
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index e93b8d4..80366a9 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -48,6 +48,26 @@ div {
font-size: 14px;
}
+.jewel.xsmall {
+ font-size: 0.6em;
+}
+
+.jewel.small {
+ font-size: 0.8em;
+}
+
+.jewel {
+ font-size: 1em;
+}
+
+.jewel.large {
+ font-size: 1.2em;
+}
+
+.jewel.xlarge {
+ font-size: 1.4em;
+}
+
.jewel.alert {
margin: 0;
padding: 0;
@@ -163,26 +183,6 @@ div {
color: silver;
}
-.jewel.xsmall {
- font-size: 0.6em;
-}
-
-.jewel.small {
- font-size: 0.8em;
-}
-
-.jewel {
- font-size: 1em;
-}
-
-.jewel.large {
- font-size: 1.2em;
-}
-
-.jewel.xlarge {
- font-size: 1.4em;
-}
-
.jewel.card {
font-size: 1em;
font-weight: 400;
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 224a28c..00a8fb2 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textinput.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textinput.sass
@@ -48,8 +48,6 @@ $textinput-border-radius: 3px
border: 1px solid darken($primary-color, 15%)
//&:hover
- // padding: 5px;
- // background-color: #DFDFDF;
&::placeholder, &:-ms-input-placeholder
color: lighten($textinput-text-color, 15%)
@@ -68,7 +66,6 @@ $textinput-border-radius: 3px
color: $disabled-font-color
.jewel.textinput
-
font:
weight: $font-weight-normal
@@ -81,15 +78,6 @@ $textinput-border-radius: 3px
@else
+textinput-theme($font-light-color)
-// .jewel.textinput.primary
-// @if $dark
-// +textinput-theme($primary-color, $font-dark-color)
-// @else
-// +textinput-theme($primary-color, $font-light-color)
-
-
-
-
// Jewel TextArea
// TextArea variables
@@ -121,8 +109,6 @@ $textarea-border-radius: 3px
border: 1px solid darken($primary-color, 15%)
//&:hover
- // padding: 5px;
- // background-color: #DFDFDF;
&::placeholder, &:-ms-input-placeholder
color: lighten($textarea-text-color, 15%)
@@ -141,7 +127,6 @@ $textarea-border-radius: 3px
color: $disabled-font-color
.jewel.textarea
-
font:
weight: $font-weight-normal
--
To stop receiving notification emails like this one, please contact
carlosrov...@apache.org.
