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
commit e0dcb41fe32a5962874901f42e9e4e2ba2b8d876
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Sun Feb 11 17:58:19 2018 +0100
VividBlueTheme initial commit
---
examples/royale/VividExample/.vscode/settings.json | 3 +
examples/royale/VividExample/pom.xml | 3 +-
frameworks/projects/Vivid/pom.xml | 4 +-
.../projects/Vivid/src/main/resources/defaults.css | 12 ++--
.../projects/VividBlueTheme/.vscode/launch.json | 21 ++++++
.../projects/VividBlueTheme/.vscode/settings.json | 3 +
.../projects/VividBlueTheme/.vscode/tasks.json | 8 +++
frameworks/projects/VividBlueTheme/asconfig.json | 34 +++++++++
.../projects/VividBlueTheme}/pom.xml | 60 ++++++----------
.../src/main/resources/defaults.css | 83 ++--------------------
.../src/main/royale/VividBlueThemeClasses.as | 33 +++++++++
11 files changed, 138 insertions(+), 126 deletions(-)
diff --git a/examples/royale/VividExample/.vscode/settings.json
b/examples/royale/VividExample/.vscode/settings.json
new file mode 100644
index 0000000..5e003ac
--- /dev/null
+++ b/examples/royale/VividExample/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "nextgenas.sdk.framework":
"/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-0.9.0"
+}
\ No newline at end of file
diff --git a/examples/royale/VividExample/pom.xml
b/examples/royale/VividExample/pom.xml
index d300258..bffd2cf 100644
--- a/examples/royale/VividExample/pom.xml
+++ b/examples/royale/VividExample/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>VividExample</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<packaging>swf</packaging>
<name>Apache Royale: Examples: Royale: VividExample</name>
@@ -50,6 +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>
</configuration>
</plugin>
</plugins>
diff --git a/frameworks/projects/Vivid/pom.xml
b/frameworks/projects/Vivid/pom.xml
index f02d1d6..f97a871 100644
--- a/frameworks/projects/Vivid/pom.xml
+++ b/frameworks/projects/Vivid/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
<artifactId>projects</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<artifactId>Vivid</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<packaging>swc</packaging>
<name>Apache Royale: Framework: Libs: Vivid</name>
diff --git a/frameworks/projects/Vivid/src/main/resources/defaults.css
b/frameworks/projects/Vivid/src/main/resources/defaults.css
index 49e516c..1230947 100644
--- a/frameworks/projects/Vivid/src/main/resources/defaults.css
+++ b/frameworks/projects/Vivid/src/main/resources/defaults.css
@@ -56,16 +56,16 @@ TextButton:active {
/*IBeadView:
ClassReference("org.apache.royale.html.beads.TextInputWithBorderView");
IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.EditableTextKeyboardController");*/
- position: relative;
+ /*position: relative;
display: inline-block;
box-sizing: border-box;
width: 300px;
max-width: 100%;
- margin: 0;
+ margin: 0;*/
}
.vTextfield--input {
- border: none;
+ /*border: none;
border-bottom: 1px solid;
border-bottom-color: rgba(0, 0, 0, 0.12);
display: block;
@@ -77,11 +77,11 @@ TextButton:active {
background: transparent;
text-align: left;
color: inherit;
- outline: none;
+ outline: none;*/
}
.vTextfield--label {
- bottom: 0;
+ /*bottom: 0;
color: rgba(0, 0, 0, 0.26);
font-size: 13px;
left: 0;
@@ -92,7 +92,7 @@ TextButton:active {
width: 100%;
overflow: hidden;
white-space: nowrap;
- text-align: left;
+ text-align: left;*/
}
/*
diff --git a/frameworks/projects/VividBlueTheme/.vscode/launch.json
b/frameworks/projects/VividBlueTheme/.vscode/launch.json
new file mode 100644
index 0000000..5dfb672
--- /dev/null
+++ b/frameworks/projects/VividBlueTheme/.vscode/launch.json
@@ -0,0 +1,21 @@
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Launch Chrome against debug.html, with sourcemaps",
+ "type": "chrome",
+ "request": "launch",
+ "file":
"${workspaceRoot}/target/javascript/bin/js-debug/index.html",
+ "sourceMaps": true,
+ "preLaunchTask": "mvn"
+ },
+ {
+ "name": "Launch Firefox against debug.html, with sourcemaps",
+ "type": "firefox",
+ "request": "launch",
+ "file":
"${workspaceRoot}/target/javascript/bin/js-debug/index.html",
+ "sourceMaps": true,
+ "preLaunchTask": "mvn"
+ }
+ ]
+}
diff --git a/frameworks/projects/VividBlueTheme/.vscode/settings.json
b/frameworks/projects/VividBlueTheme/.vscode/settings.json
new file mode 100644
index 0000000..5e003ac
--- /dev/null
+++ b/frameworks/projects/VividBlueTheme/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "nextgenas.sdk.framework":
"/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-0.9.0"
+}
\ No newline at end of file
diff --git a/frameworks/projects/VividBlueTheme/.vscode/tasks.json
b/frameworks/projects/VividBlueTheme/.vscode/tasks.json
new file mode 100644
index 0000000..5d6198d
--- /dev/null
+++ b/frameworks/projects/VividBlueTheme/.vscode/tasks.json
@@ -0,0 +1,8 @@
+{
+ // for the documentation about the tasks.json format
+ "version": "0.1.0",
+ "command": "mvn",
+ "args": ["clean", "install", "-DskipTests"],
+ "isShellCommand": true,
+ "showOutput": "always"
+}
\ No newline at end of file
diff --git a/frameworks/projects/VividBlueTheme/asconfig.json
b/frameworks/projects/VividBlueTheme/asconfig.json
new file mode 100644
index 0000000..d2773a4
--- /dev/null
+++ b/frameworks/projects/VividBlueTheme/asconfig.json
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ {
+ "config": "royale",
+ "type": "lib",
+ "compilerOptions": {
+ "debug": true,
+ "targets": [
+ "JSRoyale",
+ "SWF"
+ ],
+ "include-classes": [
+ "VividBlueThemeClasses"
+ ],
+ "include-sources": [
+ "src/main/royale"
+ ],
+ "output": "target/VividBlueThemeClasses.swc"
+ }
+}
diff --git a/examples/royale/VividExample/pom.xml
b/frameworks/projects/VividBlueTheme/pom.xml
similarity index 50%
copy from examples/royale/VividExample/pom.xml
copy to frameworks/projects/VividBlueTheme/pom.xml
index d300258..cda51c2 100644
--- a/examples/royale/VividExample/pom.xml
+++ b/frameworks/projects/VividBlueTheme/pom.xml
@@ -21,62 +21,42 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>examples-royale</artifactId>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>projects</artifactId>
<version>0.9.1-SNAPSHOT</version>
</parent>
- <artifactId>VividExample</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <packaging>swf</packaging>
+ <artifactId>VividBlueThemeClasses</artifactId>
+ <version>0.9.1-SNAPSHOT</version>
+ <packaging>swc</packaging>
- <name>Apache Royale: Examples: Royale: VividExample</name>
+ <name>Apache Royale: Framework: Libs: VividBlueThemeClasses</name>
<build>
<sourceDirectory>src/main/royale</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-maven-plugin</artifactId>
+ <version>${royale.compiler.version}</version>
<extensions>true</extensions>
<configuration>
- <mainClass>App.mxml</mainClass>
- <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>-->
+ <includeClasses>
+ <includeClass>VividBlueThemeClasses</includeClass>
+ </includeClasses>
+ <includeFiles>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ </includeFiles>
+ <includeLookupOnly>true</includeLookupOnly>
+ <!--<allowSubclassOverrides>true</allowSubclassOverrides>-->
+ <skipExtern>true</skipExtern>
+
<!--<additionalCompilerOptions>-compiler.fxg-base-class=flash.display.Sprite</additionalCompilerOptions>-->
</configuration>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Vivid</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
-
</project>
diff --git a/frameworks/projects/Vivid/src/main/resources/defaults.css
b/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
similarity index 54%
copy from frameworks/projects/Vivid/src/main/resources/defaults.css
copy to frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
index 49e516c..b79372a 100644
--- a/frameworks/projects/Vivid/src/main/resources/defaults.css
+++ b/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css
@@ -18,35 +18,6 @@
*/
@namespace "library://ns.apache.org/royale/vivid";
-/*@namespace svg "library://ns.apache.org/royale/svg";*/
-
-/*
-* Vivid TextButton
-*/
-
-TextButton {
- /* Background: */
- background-color: #D8D8D8;
- border: 1px solid #979797;
- border-radius: 3px;
-
- /* TextField: */
- font-family: 'Lato', sans-serif;
- font-size: 13px;
- color: #646D7A;
-}
-
-TextButton:hover {
- background-color: #CFCFCF;
- vertical-align: middle;
- border: none;
- border-radius: 6px;
-}
-
-TextButton:active {
- background-color: #77CEFF;
- color: #FFFFFF;
-}
/*
* Vivid TextField
@@ -65,12 +36,13 @@ TextButton:active {
}
.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;
+
+ border: none;
+ border-bottom: 2px solid;
+ border-bottom-color: #ff0000;
+ display: block;
margin: 0;
padding: 4 0;
width: 100px;
@@ -82,7 +54,7 @@ TextButton:active {
.vTextfield--label {
bottom: 0;
- color: rgba(0, 0, 0, 0.26);
+ color: #ff0000;
font-size: 13px;
left: 0;
right: 0;
@@ -94,46 +66,3 @@ TextButton:active {
white-space: nowrap;
text-align: left;
}
-
-/*
-* Vivid Slider
-*/
-Slider {
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.RangeModel");
- IBeadView: ClassReference("org.apache.royale.vivid.beads.SliderView");
- IBeadLayout:
ClassReference("org.apache.royale.html.beads.layouts.HorizontalSliderLayout");
- IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.HSliderMouseController");
- position: relative;
-}
-.SliderTrack {
- position: absolute;
-}
-.SliderThumb {
- position: absolute;
- border-radius: 15px;
-}
-
-@media -royale-swf
-{
- Slider
- {
- iThumbView:
ClassReference("org.apache.royale.vivid.beads.SliderThumbView");
- 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/src/main/royale/VividBlueThemeClasses.as
b/frameworks/projects/VividBlueTheme/src/main/royale/VividBlueThemeClasses.as
new file mode 100644
index 0000000..9808ec1
--- /dev/null
+++
b/frameworks/projects/VividBlueTheme/src/main/royale/VividBlueThemeClasses.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package
+{
+
+ /**
+ * @private
+ * This class is used to link additional classes into vivid.swc
+ * beyond those that are found by dependecy analysis starting
+ * from the classes specified in manifest.xml.
+ */
+ internal class VividBlueThemeClasses
+ {
+
+ }
+
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
carlosrov...@apache.org.
