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 231b4ed font changes 231b4ed is described below commit 231b4ed8f0c410549ae3ded3c7691bd6e4470987 Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Sun Mar 11 22:52:02 2018 +0100 font changes --- .../JewelTheme/src/main/resources/defaults.css | 2 +- .../src/main/resources/jewel-theme-as-manifest.xml | 24 ---------------------- .../src/main/resources/jewel-theme-manifest.xml | 23 --------------------- .../src/main/resources/royale-jewel-blue.css | 2 +- .../src/main/resources/royale-jewel-red.css | 2 +- .../themes/JewelTheme/src/main/sass/_global.sass | 2 +- .../src/main/sass/colors/_blue-color-palette.sass | 2 +- 7 files changed, 5 insertions(+), 52 deletions(-) diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css index a988581..7ab8952 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css @@ -20,7 +20,7 @@ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - /* fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); */ + fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); } .royale { diff --git a/frameworks/themes/JewelTheme/src/main/resources/jewel-theme-as-manifest.xml b/frameworks/themes/JewelTheme/src/main/resources/jewel-theme-as-manifest.xml deleted file mode 100644 index 05d8800..0000000 --- a/frameworks/themes/JewelTheme/src/main/resources/jewel-theme-as-manifest.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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. - ---> - -<componentPackage> - -</componentPackage> - diff --git a/frameworks/themes/JewelTheme/src/main/resources/jewel-theme-manifest.xml b/frameworks/themes/JewelTheme/src/main/resources/jewel-theme-manifest.xml deleted file mode 100644 index 1d3bd35..0000000 --- a/frameworks/themes/JewelTheme/src/main/resources/jewel-theme-manifest.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - ---> - -<componentPackage> - -</componentPackage> \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css index 03b8c00..6044867 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css +++ b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css @@ -20,7 +20,7 @@ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - /* fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); */ + fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); } .royale { diff --git a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css index 4b76076..4f2a299 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css +++ b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css @@ -20,7 +20,7 @@ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - /* fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); */ + fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); } .royale { diff --git a/frameworks/themes/JewelTheme/src/main/sass/_global.sass b/frameworks/themes/JewelTheme/src/main/sass/_global.sass index f4df725..b3e366f 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/_global.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/_global.sass @@ -25,7 +25,7 @@ -moz-box-sizing: border-box -webkit-box-sizing: border-box box-sizing: border-box - /* fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); */ + fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject") .royale padding: 10px diff --git a/frameworks/themes/JewelTheme/src/main/sass/colors/_blue-color-palette.sass b/frameworks/themes/JewelTheme/src/main/sass/colors/_blue-color-palette.sass index 135129b..3bdf08e 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/colors/_blue-color-palette.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/colors/_blue-color-palette.sass @@ -17,7 +17,7 @@ // //////////////////////////////////////////////////////////////////////////////// // Color Themes -$default-color: rgba(0,0,0,0.30) +$default-color: rgba(0,0,0,.3) $primary-color: #006CEB $secondary-color: #011833 $emphasized-color: #1FD348 -- To stop receiving notification emails like this one, please contact carlosrov...@apache.org.