This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/vivid
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/vivid by this push:
new a37cf19 try to make css per component work, but something is still
wrong
a37cf19 is described below
commit a37cf19f585e238cec8f752267cf15227f4f66fa
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Feb 16 11:43:08 2018 +0100
try to make css per component work, but something is still wrong
---
examples/royale/VividExample/pom.xml | 2 +-
.../projects/Vivid/src/main/resources/defaults.css | 12 ++++++------
.../royale/org/apache/royale/vivid/TextField.as | 6 +++---
frameworks/projects/VividBlueTheme/pom.xml | 4 ++--
.../VividBlueTheme/src/main/resources/TextField.css | 21 ++++++---------------
5 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/examples/royale/VividExample/pom.xml
b/examples/royale/VividExample/pom.xml
index f573baa..2768e30 100644
--- a/examples/royale/VividExample/pom.xml
+++ b/examples/royale/VividExample/pom.xml
@@ -50,7 +50,7 @@
<targets>JSRoyale</targets>
<!--<htmlTemplate>${basedir}/target/javascript/bin/js-debug/vivid-js-index-template.html</htmlTemplate>
<additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>-->
-
<additionalCompilerOptions>-theme=${basedir}/../../../frameworks/projects/VividBlueTheme/target/VividBlueThemeClasses-${royale.framework.version}-js.swc</additionalCompilerOptions>
+
<additionalCompilerOptions>-theme=${basedir}/../../../frameworks/projects/VividBlueTheme/target/VividBlueTheme-${royale.framework.version}-js.swc</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
diff --git a/frameworks/projects/Vivid/src/main/resources/defaults.css
b/frameworks/projects/Vivid/src/main/resources/defaults.css
index 5630039..038b881 100644
--- a/frameworks/projects/Vivid/src/main/resources/defaults.css
+++ b/frameworks/projects/Vivid/src/main/resources/defaults.css
@@ -22,12 +22,14 @@
/*
* Vivid TextField
*/
-.vTextfield {
+TextField {
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");*/
}
-.vTextfield--input {}
-.vTextfield--label {}
-
+/*.vTextField--input {}
+.vTextField--label {}
+*/
/*
* Vivid TextButton
*/
@@ -56,8 +58,6 @@ TextButton:active {
color: #FFFFFF;
}
-
-
/*
* Vivid Slider
*/
diff --git
a/frameworks/projects/Vivid/src/main/royale/org/apache/royale/vivid/TextField.as
b/frameworks/projects/Vivid/src/main/royale/org/apache/royale/vivid/TextField.as
index fc28e66..1f43a48 100644
---
a/frameworks/projects/Vivid/src/main/royale/org/apache/royale/vivid/TextField.as
+++
b/frameworks/projects/Vivid/src/main/royale/org/apache/royale/vivid/TextField.as
@@ -82,21 +82,21 @@ package org.apache.royale.vivid
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
- typeNames = "vTextfield";
+ typeNames = "TextField";
var div:HTMLDivElement = document.createElement('div') as
HTMLDivElement;
div.className = typeNames;
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/projects/VividBlueTheme/pom.xml
b/frameworks/projects/VividBlueTheme/pom.xml
index ab189e1..92b6054 100644
--- a/frameworks/projects/VividBlueTheme/pom.xml
+++ b/frameworks/projects/VividBlueTheme/pom.xml
@@ -26,11 +26,11 @@
<version>0.9.2-SNAPSHOT</version>
</parent>
- <artifactId>VividBlueThemeClasses</artifactId>
+ <artifactId>VividBlueTheme</artifactId>
<version>0.9.2-SNAPSHOT</version>
<packaging>swc</packaging>
- <name>Apache Royale: Framework: Libs: VividBlueThemeClasses</name>
+ <name>Apache Royale: Framework: Libs: VividBlueTheme</name>
<build>
<sourceDirectory>src/main/royale</sourceDirectory>
diff --git
a/frameworks/projects/VividBlueTheme/src/main/resources/TextField.css
b/frameworks/projects/VividBlueTheme/src/main/resources/TextField.css
index 4d588c1..4c5e368 100644
--- a/frameworks/projects/VividBlueTheme/src/main/resources/TextField.css
+++ b/frameworks/projects/VividBlueTheme/src/main/resources/TextField.css
@@ -23,11 +23,7 @@
/*
* 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");*/
-
+TextField {
position: relative;
display: inline-block;
box-sizing: border-box;
@@ -36,7 +32,7 @@
margin: 0;
}
-.vTextfield--input {
+.vTextField--input {
font-size: 16px;
font-family: 'Lato', sans-serif;
@@ -53,7 +49,7 @@
outline: none;
}
-.vTextfield--label {
+.vTextField--label {
bottom: 0;
color: #ff0000;
font-size: 13px;
@@ -67,18 +63,13 @@
white-space: nowrap;
text-align: left;
}
-/*
-* Vivid TextInput
-*/
-/*TextInput {
+/*
padding: 5px;
border: solid 1px #666666;
border-radius: 6px;
color: #333333;
-}
-
-TextInput:hover {
+:hover
padding: 5px;
background-color: #DFDFDF;
-}*/
\ No newline at end of file
+*/
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
[email protected].
