This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 4ec98dc jewel-theme: add new text colors based on theme colors
4ec98dc is described below
commit 4ec98dce0f6eb1ef1a43cec4507e2a3ac0e0461f
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Feb 21 20:14:48 2020 +0100
jewel-theme: add new text colors based on theme colors
---
.../projects/Core/src/main/royale/CoreClasses.as | 1 +
.../org/apache/royale/core/layout/IPaddings.as | 88 ++++++++++++++++++++++
.../JewelTheme/src/main/resources/defaults.css | 60 +++++++++++++++
.../src/main/sass/components-emphasized/_text.sass | 13 +++-
.../src/main/sass/components-primary/_text.sass | 13 +++-
.../src/main/sass/components-secondary/_text.sass | 13 +++-
6 files changed, 185 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as
b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index e901fc3..0682a89 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -55,6 +55,7 @@ internal class CoreClasses
import org.apache.royale.core.ImageViewBase; ImageViewBase;
import org.apache.royale.core.BrowserWindow; BrowserWindow;
+ import org.apache.royale.core.layout.IPaddings; IPaddings;
import org.apache.royale.core.layout.ILayoutStyleProperties;
ILayoutStyleProperties;
COMPILE::SWF
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/layout/IPaddings.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/layout/IPaddings.as
new file mode 100644
index 0000000..7e3f042
--- /dev/null
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/layout/IPaddings.as
@@ -0,0 +1,88 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 org.apache.royale.core.layout
+{
+ import org.apache.royale.core.IBead;
+
+ /**
+ * The Paddings class is a bead that adds padding to its host
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ public interface IPaddings extends IBead
+ {
+ /**
+ * The padding value. Setting this value override the rest of
values
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ function get padding():Number;
+ function set padding(value:Number):void;
+
+ /**
+ * The top padding value.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ function get paddingTop():Number;
+ function set paddingTop(value:Number):void;
+
+ /**
+ * The right padding value.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ function get paddingRight():Number;
+ function set paddingRight(value:Number):void;
+
+ /**
+ * The bottom padding value.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ function get paddingBottom():Number;
+ function set paddingBottom(value:Number):void;
+
+ /**
+ * The left padding value.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ function get paddingLeft():Number;
+ function set paddingLeft(value:Number):void;
+ }
+}
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 0bb820d..2c7d66e 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -1087,6 +1087,26 @@ a:active {
color: #0f88d1;
}
+.primary-light {
+ color: #fafdff;
+}
+
+.primary-lightest {
+ color: #9bd5f8;
+}
+
+.primary-normal {
+ color: #3CADF1;
+}
+
+.primary-dark {
+ color: #0d79ba;
+}
+
+.primary-darkest {
+ color: #063b5b;
+}
+
.jewel.textinput {
font-weight: 400;
color: #808080;
@@ -1413,6 +1433,26 @@ a:active {
color: #f37f59;
}
+.secondary-light {
+ color: #fdede8;
+}
+
+.secondary-lightest {
+ color: #f6a389;
+}
+
+.secondary-normal {
+ color: #EF5A2A;
+}
+
+.secondary-dark {
+ color: #a6320d;
+}
+
+.secondary-darkest {
+ color: #481605;
+}
+
.jewel.togglebutton.secondary {
background: linear-gradient(#f16c42, #ed4812);
border: 1px solid #be390e;
@@ -1511,6 +1551,26 @@ a:active {
background: linear-gradient(#8CC63C, #71a02f);
}
+.emphasized-light {
+ color: #e9f4da;
+}
+
+.emphasized-lightest {
+ color: #bbdd8b;
+}
+
+.emphasized-normal {
+ color: #8CC63C;
+}
+
+.emphasized-dark {
+ color: #557923;
+}
+
+.emphasized-darkest {
+ color: #1d2a0c;
+}
+
.jewel.togglebutton.emphasized {
background: linear-gradient(#98cc50, #7eb435);
border: 1px solid #638c29;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_text.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_text.sass
index 39baff0..9be6277 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_text.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_text.sass
@@ -19,4 +19,15 @@
// selected link
// a:active
-// color: $emphasized-color
\ No newline at end of file
+// color: $emphasized-color
+
+.emphasized-light
+ color: lighten($emphasized-color, 40%)
+.emphasized-lightest
+ color: lighten($emphasized-color, 20%)
+.emphasized-normal
+ color: $emphasized-color
+.emphasized-dark
+ color: darken($emphasized-color, 20%)
+.emphasized-darkest
+ color: darken($emphasized-color, 40%)
\ No newline at end of file
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_text.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_text.sass
index 0fb6f3e..5eeb1c3 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_text.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_text.sass
@@ -21,4 +21,15 @@
a:link
color: $primary-color
a:active
- color: darken($primary-color, 15%)
\ No newline at end of file
+ color: darken($primary-color, 15%)
+
+.primary-light
+ color: lighten($primary-color, 40%)
+.primary-lightest
+ color: lighten($primary-color, 20%)
+.primary-normal
+ color: $primary-color
+.primary-dark
+ color: darken($primary-color, 20%)
+.primary-darkest
+ color: darken($primary-color, 40%)
\ No newline at end of file
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_text.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_text.sass
index f6b627c..1629219 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_text.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_text.sass
@@ -25,4 +25,15 @@ a:hover
color: $secondary-color
// selected link
a:active
- color: lighten($secondary-color, 10%)
\ No newline at end of file
+ color: lighten($secondary-color, 10%)
+
+.secondary-light
+ color: lighten($secondary-color, 40%)
+.secondary-lightest
+ color: lighten($secondary-color, 20%)
+.secondary-normal
+ color: $secondary-color
+.secondary-dark
+ color: darken($secondary-color, 20%)
+.secondary-darkest
+ color: darken($secondary-color, 40%)
\ No newline at end of file
