royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch jewel-ui updated: library.swf now gets info about JewelThemeFontInject
Date Sun, 11 Mar 2018 22:10:20 GMT
This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch jewel-ui
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/jewel-ui by this push:
     new f90d09c  library.swf now gets info about JewelThemeFontInject
f90d09c is described below

commit f90d09c5345b27cab540c463dd5e545d7fce7892
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Sun Mar 11 23:10:17 2018 +0100

    library.swf now gets info about JewelThemeFontInject
---
 frameworks/themes/JewelTheme/pom.xml               |  17 +-
 .../src/main/config/compile-swf-config.xml         |  22 +-
 .../JewelTheme/src/main/resources/defaults.css     | 264 ---------------------
 .../themes/JewelTheme/src/main/sass/defaults.sass  |  36 ---
 4 files changed, 2 insertions(+), 337 deletions(-)

diff --git a/frameworks/themes/JewelTheme/pom.xml b/frameworks/themes/JewelTheme/pom.xml
index 4096e7e..055a04d 100644
--- a/frameworks/themes/JewelTheme/pom.xml
+++ b/frameworks/themes/JewelTheme/pom.xml
@@ -41,17 +41,6 @@
         <version>${royale.compiler.version}</version>
         <extensions>true</extensions>
         <configuration>
-          <namespaces>
-            <namespace>
-              <uri>library://ns.apache.org/royale/jewel</uri>
-              <manifest>${project.basedir}/src/main/resources/jewel-theme-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-              <type>as</type>
-              <uri>library://ns.apache.org/royale/jewel</uri>
-              <manifest>${project.basedir}/src/main/resources/jewel-theme-as-manifest.xml</manifest>
-            </namespace>
-          </namespaces>
           <includeClasses>
             <includeClass>JewelThemeClasses</includeClass>
           </includeClasses>
@@ -60,12 +49,8 @@
               <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> -->
             <include-file>
-              <name>royale-jewel-red.css</name>
+              <name>royale-jewel-blue.css</name>
               <path>../src/main/resources/royale-jewel-blue.css</path>
             </include-file>
           </includeFiles>
diff --git a/frameworks/themes/JewelTheme/src/main/config/compile-swf-config.xml b/frameworks/themes/JewelTheme/src/main/config/compile-swf-config.xml
index a6b5c38..bb3e613 100644
--- a/frameworks/themes/JewelTheme/src/main/config/compile-swf-config.xml
+++ b/frameworks/themes/JewelTheme/src/main/config/compile-swf-config.xml
@@ -35,7 +35,6 @@
             <path-element>../../../../../libs/Basic.swc</path-element>
             <path-element>../../../../../libs/Collections.swc</path-element>
             <path-element>../../../../../libs/HTML.swc</path-element>
-            <path-element>../../../../../libs/Jewel.swc</path-element>
         </external-library-path>
         
         <allow-subclass-overrides>true</allow-subclass-overrides>
@@ -67,17 +66,6 @@
         
         <library-path/>
 
-        <namespaces>
-            <namespace>
-                <uri>library://ns.apache.org/royale/jewel</uri>
-                <manifest>../resources/jewel-theme-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.apache.org/royale/jewel</uri>
-                <manifest>../resources/jewel-theme-as-manifest.xml</manifest>
-            </namespace>
-        </namespaces>
-        
         <source-path>
             <path-element>../royale</path-element>
         </source-path>
@@ -89,21 +77,13 @@
         <name>defaults.css</name>
         <path>../resources/defaults.css</path>
     </include-file>
-    <include-file>
-        <name>TextButton.css</name>
-        <path>../resources/TextButton.css</path>
-    </include-file>
-    <include-file>
-        <name>TextField.css</name>
-        <path>../resources/TextField.css</path>
-    </include-file>
 
     <include-lookup-only>true</include-lookup-only>
     
     <include-classes>
         <class>JewelThemeClasses</class>
     </include-classes>
-        
+    
     <target-player>${playerglobal.version}</target-player>
 	
 
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
deleted file mode 100644
index 7ab8952..0000000
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ /dev/null
@@ -1,264 +0,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.
- */
-@namespace j "library://ns.apache.org/royale/jewel";
-@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;
-  fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject");
-}
-
-.royale {
-  padding: 10px;
-  margin: 10px;
-}
-
-/**
- * Jewel Button
- */
-.jewel.button, .jewel.button:hover, .jewel.textbutton, .jewel.textbutton:hover {
-  cursor: pointer;
-  display: inline-block;
-  margin: 0;
-  padding: 10px 16px;
-  min-width: 74px;
-  min-height: 34px;
-  /* Background: */
-  border: none;
-  border-radius: 3px;
-}
-
-.jewel.button {
-  background-color: rgba(0, 0, 0, 0.3);
-  transition-duration: 0.4s;
-  color: rgba(0, 0, 0, 0.4);
-}
-.jewel.button:hover {
-  background-color: rgba(15, 15, 15, 0.3);
-}
-.jewel.button:active {
-  background-color: rgba(0, 0, 0, 0.3);
-}
-.jewel.button:focus {
-  outline: 0;
-}
-.jewel.button[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-.jewel.button.primary {
-  background-color: #006CEB;
-  transition-duration: 0.4s;
-  color: white;
-}
-.jewel.button.primary:hover {
-  background-color: #0b7bff;
-}
-.jewel.button.primary:active {
-  background-color: #005ecc;
-}
-.jewel.button.primary:focus {
-  outline: 0;
-}
-.jewel.button.primary[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-.jewel.button.secondary {
-  background-color: #011833;
-  transition-duration: 0.4s;
-  color: white;
-}
-.jewel.button.secondary:hover {
-  background-color: #022651;
-}
-.jewel.button.secondary:active {
-  background-color: #000a15;
-}
-.jewel.button.secondary:focus {
-  outline: 0;
-}
-.jewel.button.secondary[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-.jewel.button.emphasized {
-  background-color: #1FD348;
-  transition-duration: 0.4s;
-  color: white;
-}
-.jewel.button.emphasized:hover {
-  background-color: #30e158;
-}
-.jewel.button.emphasized:active {
-  background-color: #1bb83f;
-}
-.jewel.button.emphasized:focus {
-  outline: 0;
-}
-.jewel.button.emphasized[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-/**
- * Jewel TextButton
- */
-.jewel.textbutton, .jewel.textbutton:hover {
-  /* TextField */
-  font-family: "Lato-Bold", sans-serif;
-  font-style: bold;
-  font-size: 0.7rem;
-  text-transform: uppercase;
-  text-decoration: none;
-}
-.jewel.textbutton [disabled] {
-  text-shadow: unset;
-}
-
-.jewel.textbutton {
-  background-color: rgba(0, 0, 0, 0.3);
-  transition-duration: 0.4s;
-  color: rgba(0, 0, 0, 0.4);
-}
-.jewel.textbutton:hover {
-  background-color: rgba(15, 15, 15, 0.3);
-}
-.jewel.textbutton:active {
-  background-color: rgba(0, 0, 0, 0.3);
-}
-.jewel.textbutton:focus {
-  outline: 0;
-}
-.jewel.textbutton[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-.jewel.textbutton.primary {
-  background-color: #006CEB;
-  transition-duration: 0.4s;
-  color: white;
-}
-.jewel.textbutton.primary:hover {
-  background-color: #0b7bff;
-}
-.jewel.textbutton.primary:active {
-  background-color: #005ecc;
-}
-.jewel.textbutton.primary:focus {
-  outline: 0;
-}
-.jewel.textbutton.primary[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-.jewel.textbutton.secondary {
-  background-color: #011833;
-  transition-duration: 0.4s;
-  color: white;
-}
-.jewel.textbutton.secondary:hover {
-  background-color: #022651;
-}
-.jewel.textbutton.secondary:active {
-  background-color: #000a15;
-}
-.jewel.textbutton.secondary:focus {
-  outline: 0;
-}
-.jewel.textbutton.secondary[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-.jewel.textbutton.emphasized {
-  background-color: #1FD348;
-  transition-duration: 0.4s;
-  color: white;
-}
-.jewel.textbutton.emphasized:hover {
-  background-color: #30e158;
-}
-.jewel.textbutton.emphasized:active {
-  background-color: #1bb83f;
-}
-.jewel.textbutton.emphasized:focus {
-  outline: 0;
-}
-.jewel.textbutton.emphasized[disabled] {
-  background-color: #CCCCCC;
-  color: #888888;
-  cursor: unset;
-}
-
-/**
- * Jewel TextField
- */
-TextField {
-  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;
-}
-
-/*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
deleted file mode 100644
index c96fa61..0000000
--- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
+++ /dev/null
@@ -1,36 +0,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.
- */
-
-// Variables
-@import "colors/blue-color-palette"
-@import "variables"
-@import "mixins"
-@import "functions"
-
-// Global
-@import "global"
-
-// Components
-
-// Button
-@import "button"
-
-// TextButton
-@import "textbutton"
-
-// TextField
-@import "textfield"
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.

Mime
View raw message