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 89c5133 start of themes generation
89c5133 is described below
commit 89c513307936a56deaee08e584aef6872722a44d
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Apr 5 18:20:40 2018 +0200
start of themes generation
---
.../themes/Jewel-Light-NoFlat-Blue-Theme/build.xml | 133 +++++++++++++++++++++
.../themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml | 59 +++++++++
.../src/main/resources/assets/empty | 20 ++++
.../src/main/resources/defaults.css | 38 +++---
frameworks/themes/JewelTheme/pom.xml | 14 ++-
.../JewelTheme/src/main/resources/defaults.css | 38 +++---
.../main/sass/themes/light-noflat-blue/_theme.sass | 24 ++++
.../sass/themes/light-noflat-blue/defaults.sass | 38 ++++++
frameworks/themes/pom.xml | 2 +
9 files changed, 327 insertions(+), 39 deletions(-)
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml
b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml
new file mode 100644
index 0000000..c21bb37
--- /dev/null
+++ b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+
+
+<project name="Jewel-Light-NoFlat-Blue-Theme" default="main" basedir=".">
+ <property name="ROYALE_HOME" location="../../.."/>
+
+ <property file="${ROYALE_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${ROYALE_HOME}/build.properties"/>
+ <property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
+
+ <property name="target.name" value="${ant.project.name}.swc" />
+
+ <!-- doesn't contain compiled files so only need to compile JS version -->
+ <target name="main"
depends="clean,check-compiler,compile,compile-js,copy-swc,test"
description="Full build of ${ant.project.name}.swc">
+ </target>
+
+ <target name="compile-js">
+ <!-- doesn't contain compiled files so only need to compile JS version
+ <ant
dir="${ROYALE_HOME}/frameworks/js/projects/${ant.project.name}JS/"
inheritAll="false" >
+ <property name="ROYALE_SWF_COMPILER_HOME"
value="${ROYALE_SWF_COMPILER_HOME}"/>
+ <property name="ROYALE_COMPILER_HOME"
value="${ROYALE_COMPILER_HOME}"/>
+ <property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
+ </ant>
+ -->
+ </target>
+
+ <target name="copy-swc" if="env.AIR_HOME">
+ <copy file="${basedir}/target/${target.name}"
tofile="${ROYALE_HOME}/frameworks/libs/${target.name}" />
+ </target>
+
+ <target name="check-for-tests" >
+ <condition property="skip-tests" >
+ <not>
+ <available file="${basedir}/src/test/royale/build.xml" />
+ </not>
+ </condition>
+ </target>
+
+ <target name="test" depends="check-for-tests" unless="skip-tests">
+ <ant dir="src/test/royale" />
+ </target>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset dir="${ROYALE_HOME}/frameworks/libs">
+ <include name="${target.name}"/>
+ </fileset>
+ </delete>
+ <delete failonerror="false" includeemptydirs="true">
+ <fileset dir="${basedir}/target">
+ <include name="**/**"/>
+ </fileset>
+ </delete>
+ <antcall target="clean-tests" />
+ </target>
+
+ <target name="clean-tests" depends="check-for-tests" unless="skip-tests">
+ <ant dir="src/test/royale" target="clean"/>
+ </target>
+
+ <target name="compile" description="Compiles .as files into .swc"
if="env.AIR_HOME">
+ <echo message="Compiling libs/${ant.project.name}.swc"/>
+ <echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
+ <echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
+ <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
+
+ <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" >
+ <jvmarg value="-Xmx384m" />
+ <jvmarg value="-Dsun.io.useCanonCaches=false" />
+ <jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" />
+ <arg value="+royalelib=${ROYALE_HOME}/frameworks" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+ <arg value="-compiler.strict-xml=true" />
+ <arg value="-compiler.targets=SWF,JSRoyale" />
+ <arg value="-output=${basedir}/target/${target.name}" />
+ <arg
value="-load-config=${basedir}/src/main/config/compile-swf-config.xml" />
+ <arg
value="-js-load-config=${ROYALE_HOME}/frameworks/js-config.xml" />
+ <arg
value="-js-load-config+=${basedir}/../../js/themes/${ant.project.name}JS/src/main/config/compile-js-config.xml"
/>
+ </java>
+ </target>
+
+ <target name="check-compiler"
depends="check-compiler-home,check-transpiler-home">
+ <path id="lib.path">
+ <fileset dir="${ROYALE_COMPILER_HOME}/lib"
includes="compiler-royaleTasks.jar"/>
+ </path>
+ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
+ </target>
+
+ <target name="check-compiler-home"
+ description="Set ROYALE_SWF_COMPILER_HOME to point at the compiler.">
+
+ <available file="${ROYALE_HOME}/lib/compiler-mxmlc.jar"
+ type="file"
+ property="ROYALE_SWF_COMPILER_HOME"
+ value="${ROYALE_HOME}"/>
+
+ <fail message="ROYALE_SWF_COMPILER_HOME must be set to a folder with a
lib sub-folder containing compiler-mxmlc.jar such as the compiler folder in
royale-compiler repo or the root of a Royale SDK"
+ unless="ROYALE_SWF_COMPILER_HOME"/>
+ </target>
+
+ <target name="check-transpiler-home"
+ description="Set ROYALE_COMPILER_HOME to point at the cross-compiler.">
+
+ <available file="${ROYALE_HOME}/js/lib/jsc.jar"
+ type="file"
+ property="ROYALE_COMPILER_HOME"
+ value="${ROYALE_HOME}/js"/>
+
+ <fail message="ROYALE_COMPILER_HOME must be set to a folder with a lib
sub-folder containing jsc.jar such as the compiler-jx folder in royale-compiler
repo or the js folder of a Royale SDK"
+ unless="ROYALE_COMPILER_HOME"/>
+ </target>
+
+</project>
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml
b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml
new file mode 100644
index 0000000..11067c6
--- /dev/null
+++ b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>themes</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>Jewel-Light-NoFlat-Blue-Theme</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <packaging>swc</packaging>
+
+ <name>Apache Royale: Framework: Themes: Jewel-Light-NoFlat-Blue-Theme</name>
+
+ <build>
+ <sourceDirectory>src/main/royale</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.royale.compiler</groupId>
+ <artifactId>royale-maven-plugin</artifactId>
+ <version>${royale.compiler.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <includeFiles>
+ <include-file>
+ <name>assets/*</name>
+ <path>../src/main/resources/assets/*</path>
+ </include-file>
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ </includeFiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git
a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty
b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty
new file mode 100644
index 0000000..e71be78
--- /dev/null
+++
b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty
@@ -0,0 +1,20 @@
+<!--
+
+ 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.
+
+-->
+
+// This is needed since assets folder must have at least one file
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css
similarity index 95%
copy from frameworks/themes/JewelTheme/src/main/resources/defaults.css
copy to
frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css
index 8912ace..04140c2 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css
@@ -208,24 +208,24 @@ j|Alert {
padding: 8px;
min-width: 34px;
min-height: 34px;
- border: 1px solid #277b32;
- background: linear-gradient(#45c354, #34a241);
- box-shadow: inset 0 1px 0 #7fd68a;
+ border: 1px solid #638c29;
+ background: linear-gradient(#98cc50, #7eb435);
+ box-shadow: inset 0 1px 0 #bbdd8b;
border-radius: 3px;
}
.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus {
- border: 1px solid #21682a;
- background: linear-gradient(#3AB549, #2e8e39);
+ border: 1px solid #557923;
+ background: linear-gradient(#8CC63C, #71a02f);
}
.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus {
- border: 1px solid #15411a;
- background: linear-gradient(#2e8e39, #21682a);
+ border: 1px solid #395118;
+ background: linear-gradient(#71a02f, #557923);
box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
}
.jewel.button.emphasized:focus {
outline: none;
- border: 1px solid #277b32;
- box-shadow: inset 0px 0px 0px 1px rgba(243, 251, 244, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
+ border: 1px solid #638c29;
+ box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.emphasized[disabled] {
cursor: unset;
@@ -503,9 +503,9 @@ j|Alert {
padding: 10px 16px;
min-width: 74px;
min-height: 34px;
- border: 1px solid #277b32;
- background: linear-gradient(#45c354, #34a241);
- box-shadow: inset 0 1px 0 #7fd68a;
+ border: 1px solid #638c29;
+ background: linear-gradient(#98cc50, #7eb435);
+ box-shadow: inset 0 1px 0 #bbdd8b;
border-radius: 3px;
font-family: "Lato", sans-serif;
font-size: 14px;
@@ -513,21 +513,21 @@ j|Alert {
color: #FFFFFF;
text-transform: uppercase;
text-decoration: none;
- text-shadow: 0 -1px 0 rgba(21, 65, 26, 0.7);
+ text-shadow: 0 -1px 0 rgba(57, 81, 24, 0.7);
}
.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus {
- border: 1px solid #21682a;
- background: linear-gradient(#3AB549, #2e8e39);
+ border: 1px solid #557923;
+ background: linear-gradient(#8CC63C, #71a02f);
}
.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus
{
- border: 1px solid #15411a;
- background: linear-gradient(#2e8e39, #21682a);
+ border: 1px solid #395118;
+ background: linear-gradient(#71a02f, #557923);
box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
}
.jewel.textbutton.emphasized:focus {
outline: none;
- border: 1px solid #277b32;
- box-shadow: inset 0px 0px 0px 1px rgba(243, 251, 244, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
+ border: 1px solid #638c29;
+ box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.textbutton.emphasized[disabled] {
cursor: unset;
diff --git a/frameworks/themes/JewelTheme/pom.xml
b/frameworks/themes/JewelTheme/pom.xml
index 6fcfebd..1ac7235 100644
--- a/frameworks/themes/JewelTheme/pom.xml
+++ b/frameworks/themes/JewelTheme/pom.xml
@@ -78,12 +78,24 @@
<source>
<directory>${basedir}/src/main/sass</directory>
<includes>
- <include>**/*.sass</include>
+ <include>defaults.sass</include>
</includes>
</source>
<destination>${basedir}/src/main/resources</destination>
</resource>
</resources>
+ <resources>
+ <resource>
+ <source>
+
<directory>${basedir}/src/main/sass/themes/light-noflat-blue</directory>
+ <includes>
+ <include>defaults.sass</include>
+ </includes>
+ </source>
+ <relativeOutputDirectory>../..</relativeOutputDirectory>
+
<destination>${basedir}/../Jewel-Light-NoFlat-Blue-Theme/src/main/resources</destination>
+ </resource>
+ </resources>
</configuration>
<executions>
<execution>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 8912ace..04140c2 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -208,24 +208,24 @@ j|Alert {
padding: 8px;
min-width: 34px;
min-height: 34px;
- border: 1px solid #277b32;
- background: linear-gradient(#45c354, #34a241);
- box-shadow: inset 0 1px 0 #7fd68a;
+ border: 1px solid #638c29;
+ background: linear-gradient(#98cc50, #7eb435);
+ box-shadow: inset 0 1px 0 #bbdd8b;
border-radius: 3px;
}
.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus {
- border: 1px solid #21682a;
- background: linear-gradient(#3AB549, #2e8e39);
+ border: 1px solid #557923;
+ background: linear-gradient(#8CC63C, #71a02f);
}
.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus {
- border: 1px solid #15411a;
- background: linear-gradient(#2e8e39, #21682a);
+ border: 1px solid #395118;
+ background: linear-gradient(#71a02f, #557923);
box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
}
.jewel.button.emphasized:focus {
outline: none;
- border: 1px solid #277b32;
- box-shadow: inset 0px 0px 0px 1px rgba(243, 251, 244, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
+ border: 1px solid #638c29;
+ box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.emphasized[disabled] {
cursor: unset;
@@ -503,9 +503,9 @@ j|Alert {
padding: 10px 16px;
min-width: 74px;
min-height: 34px;
- border: 1px solid #277b32;
- background: linear-gradient(#45c354, #34a241);
- box-shadow: inset 0 1px 0 #7fd68a;
+ border: 1px solid #638c29;
+ background: linear-gradient(#98cc50, #7eb435);
+ box-shadow: inset 0 1px 0 #bbdd8b;
border-radius: 3px;
font-family: "Lato", sans-serif;
font-size: 14px;
@@ -513,21 +513,21 @@ j|Alert {
color: #FFFFFF;
text-transform: uppercase;
text-decoration: none;
- text-shadow: 0 -1px 0 rgba(21, 65, 26, 0.7);
+ text-shadow: 0 -1px 0 rgba(57, 81, 24, 0.7);
}
.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus {
- border: 1px solid #21682a;
- background: linear-gradient(#3AB549, #2e8e39);
+ border: 1px solid #557923;
+ background: linear-gradient(#8CC63C, #71a02f);
}
.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus
{
- border: 1px solid #15411a;
- background: linear-gradient(#2e8e39, #21682a);
+ border: 1px solid #395118;
+ background: linear-gradient(#71a02f, #557923);
box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
}
.jewel.textbutton.emphasized:focus {
outline: none;
- border: 1px solid #277b32;
- box-shadow: inset 0px 0px 0px 1px rgba(243, 251, 244, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
+ border: 1px solid #638c29;
+ box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.textbutton.emphasized[disabled] {
cursor: unset;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/_theme.sass
b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/_theme.sass
new file mode 100644
index 0000000..adbaeb3
--- /dev/null
+++
b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/_theme.sass
@@ -0,0 +1,24 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+//Theme Style (Flat or Gradient)
+$flat: false
+$dark: false
+$primary-color: $blue
+$emphasized-color: $emerald
\ No newline at end of file
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass
b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass
new file mode 100644
index 0000000..0e8db40
--- /dev/null
+++
b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+
+// Variables
+@import "../../colors"
+@import "theme"
+@import "../../variables"
+@import "../../mixins"
+@import "../../functions"
+
+// Global
+@import "../../global"
+
+// Components
+@import "../../components/alert"
+@import "../../components/button"
+@import "../../components/checkbox"
+@import "../../components/controlbar"
+@import "../../components/label"
+@import "../../components/radiobutton"
+@import "../../components/slider"
+@import "../../components/textbutton"
+@import "../../components/textfield"
+@import "../../components/titlebar"
diff --git a/frameworks/themes/pom.xml b/frameworks/themes/pom.xml
index a30c613..765e468 100644
--- a/frameworks/themes/pom.xml
+++ b/frameworks/themes/pom.xml
@@ -36,6 +36,8 @@
<module>Basic</module>
<module>JewelTheme</module>
<module>JewelBlueTheme</module>
+
+ <module>Jewel-Light-NoFlat-Blue-Theme</module>
</modules>
<dependencies>
--
To stop receiving notification emails like this one, please contact
[email protected].
