This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/themes
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/themes by this push:
new 5f23cd7 Create TextField.css and add it to pom in VividBlueTheme.
remove TF css rules from vivid set
5f23cd7 is described below
commit 5f23cd7e5ea7013584b77014f5e8984e52c550ed
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Feb 15 09:10:16 2018 +0100
Create TextField.css and add it to pom in VividBlueTheme.
remove TF css rules from vivid set
---
examples/royale/VividExample/.vscode/settings.json | 2 +-
.../src/main/resources/vivid-example-styles.css | 10 ---
frameworks/projects/Vivid/pom.xml | 4 --
.../projects/Vivid/src/main/resources/defaults.css | 71 +++-------------------
frameworks/projects/VividBlueTheme/pom.xml | 4 ++
.../main/resources/{defaults.css => TextField.css} | 16 +++++
.../VividBlueTheme/src/main/resources/defaults.css | 61 ++++---------------
7 files changed, 43 insertions(+), 125 deletions(-)
diff --git a/examples/royale/VividExample/.vscode/settings.json
b/examples/royale/VividExample/.vscode/settings.json
index 5e003ac..1069e6c 100644
--- a/examples/royale/VividExample/.vscode/settings.json
+++ b/examples/royale/VividExample/.vscode/settings.json
@@ -1,3 +1,3 @@
{
- "nextgenas.sdk.framework":
"/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-0.9.0"
+ "nextgenas.sdk.framework":
"/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-0.9.1"
}
\ No newline at end of file
diff --git
a/examples/royale/VividExample/src/main/resources/vivid-example-styles.css
b/examples/royale/VividExample/src/main/resources/vivid-example-styles.css
index 922b5fe..48829b3 100644
--- a/examples/royale/VividExample/src/main/resources/vivid-example-styles.css
+++ b/examples/royale/VividExample/src/main/resources/vivid-example-styles.css
@@ -21,15 +21,5 @@
@namespace "http://www.w3.org/1999/xhtml";;
-.royale *, . royale *:before, . royale *:after {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
-}
-.page-content
-{
- padding: 10px;
- margin: 10px;
-}
diff --git a/frameworks/projects/Vivid/pom.xml
b/frameworks/projects/Vivid/pom.xml
index f02d1d6..3ec2f3a 100644
--- a/frameworks/projects/Vivid/pom.xml
+++ b/frameworks/projects/Vivid/pom.xml
@@ -51,10 +51,6 @@
<uri>library://ns.apache.org/royale/vivid</uri>
<manifest>${project.basedir}/src/main/resources/vivid-as-manifest.xml</manifest>
</namespace>
- <!--<namespace>
- <uri>library://ns.apache.org/royale/svg</uri>
-
<manifest>${project.basedir}/src/main/resources/svg-manifest.xml</manifest>
- </namespace>-->
</namespaces>
<includeClasses>
<includeClass>VividClasses</includeClass>
diff --git a/frameworks/projects/Vivid/src/main/resources/defaults.css
b/frameworks/projects/Vivid/src/main/resources/defaults.css
index 1230947..5630039 100644
--- a/frameworks/projects/Vivid/src/main/resources/defaults.css
+++ b/frameworks/projects/Vivid/src/main/resources/defaults.css
@@ -18,7 +18,15 @@
*/
@namespace "library://ns.apache.org/royale/vivid";
-/*@namespace svg "library://ns.apache.org/royale/svg";*/
+
+/*
+* Vivid TextField
+*/
+.vTextfield {
+ IBeadModel:
ClassReference("org.apache.royale.html.beads.models.TextModel");
+}
+.vTextfield--input {}
+.vTextfield--label {}
/*
* Vivid TextButton
@@ -48,52 +56,7 @@ TextButton:active {
color: #FFFFFF;
}
-/*
-* Vivid TextField
-*/
-.vTextfield {
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.TextModel");
- /*IBeadView:
ClassReference("org.apache.royale.html.beads.TextInputWithBorderView");
- IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.EditableTextKeyboardController");*/
-
- /*position: relative;
- display: inline-block;
- box-sizing: border-box;
- width: 300px;
- max-width: 100%;
- margin: 0;*/
-}
-
-.vTextfield--input {
- /*border: none;
- border-bottom: 1px solid;
- border-bottom-color: rgba(0, 0, 0, 0.12);
- display: block;
- font-size: 16px;
- font-family: 'Lato', sans-serif;
- margin: 0;
- padding: 4 0;
- width: 100px;
- background: transparent;
- text-align: left;
- color: inherit;
- outline: none;*/
-}
-.vTextfield--label {
- /*bottom: 0;
- color: rgba(0, 0, 0, 0.26);
- font-size: 13px;
- left: 0;
- right: 0;
- pointer-events: none;
- position: absolute;
- display: block;
- width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-align: left;*/
-}
/*
* Vivid Slider
@@ -121,19 +84,3 @@ Slider {
iTrackView:
ClassReference("org.apache.royale.vivid.beads.SliderTrackView");
}
}
-
-/*
-* Vivid TextInput
-*/
-
-/*TextInput {
- padding: 5px;
- border: solid 1px #666666;
- border-radius: 6px;
- color: #333333;
-}
-
-TextInput:hover {
- padding: 5px;
- background-color: #DFDFDF;
-}*/
diff --git a/frameworks/projects/VividBlueTheme/pom.xml
b/frameworks/projects/VividBlueTheme/pom.xml
index fc11bf0..ab189e1 100644
--- a/frameworks/projects/VividBlueTheme/pom.xml
+++ b/frameworks/projects/VividBlueTheme/pom.xml
@@ -49,6 +49,10 @@
<name>defaults.css</name>
<path>../src/main/resources/defaults.css</path>
</include-file>
+ <include-file>
+ <name>TextField.css</name>
+ <path>../src/main/resources/TextField.css</path>
+ </include-file>
</includeFiles>
<includeLookupOnly>true</includeLookupOnly>
<!--<allowSubclassOverrides>true</allowSubclassOverrides>-->
diff --git a/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
b/frameworks/projects/VividBlueTheme/src/main/resources/TextField.css
similarity index 87%
copy from frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
copy to frameworks/projects/VividBlueTheme/src/main/resources/TextField.css
index b79372a..4d588c1 100644
--- a/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
+++ b/frameworks/projects/VividBlueTheme/src/main/resources/TextField.css
@@ -18,6 +18,7 @@
*/
@namespace "library://ns.apache.org/royale/vivid";
+/*@namespace svg "library://ns.apache.org/royale/svg";*/
/*
* Vivid TextField
@@ -66,3 +67,18 @@
white-space: nowrap;
text-align: left;
}
+/*
+* Vivid TextInput
+*/
+
+/*TextInput {
+ padding: 5px;
+ border: solid 1px #666666;
+ border-radius: 6px;
+ color: #333333;
+}
+
+TextInput:hover {
+ padding: 5px;
+ background-color: #DFDFDF;
+}*/
\ No newline at end of file
diff --git a/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
b/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
index b79372a..3d376ac 100644
--- a/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
+++ b/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
@@ -17,52 +17,17 @@
*
*/
-@namespace "library://ns.apache.org/royale/vivid";
+ @namespace "http://www.w3.org/1999/xhtml";;
-/*
-* Vivid TextField
-*/
-.vTextfield {
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.TextModel");
- /*IBeadView:
ClassReference("org.apache.royale.html.beads.TextInputWithBorderView");
- IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.EditableTextKeyboardController");*/
-
- position: relative;
- display: inline-block;
- box-sizing: border-box;
- width: 300px;
- max-width: 100%;
- margin: 0;
-}
-
-.vTextfield--input {
- font-size: 16px;
- font-family: 'Lato', sans-serif;
-
- border: none;
- border-bottom: 2px solid;
- border-bottom-color: #ff0000;
- display: block;
- margin: 0;
- padding: 4 0;
- width: 100px;
- background: transparent;
- text-align: left;
- color: inherit;
- outline: none;
-}
-
-.vTextfield--label {
- bottom: 0;
- color: #ff0000;
- font-size: 13px;
- left: 0;
- right: 0;
- pointer-events: none;
- position: absolute;
- display: block;
- width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-align: left;
-}
+ .royale *, . royale *:before, . royale *:after {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+
+ .page-content
+ {
+ padding: 10px;
+ margin: 10px;
+ }
+
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
[email protected].
