This is an automated email from the ASF dual-hosted git repository.
harbs 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 6df55327bf Colors should return name value pairs
6df55327bf is described below
commit 6df55327bf8443357054d7fba3daf0ae04ca1313
Author: Harbs <[email protected]>
AuthorDate: Tue Feb 24 18:53:18 2026 +0200
Colors should return name value pairs
---
.../org/apache/royale/style/colors/AmberSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/BlueSwatch.as | 44 +++++++++++-----------
.../spacing/MarginBlock.as => colors/ColorPair.as} | 12 ++++--
.../org/apache/royale/style/colors/CyanSwatch.as | 44 +++++++++++-----------
.../apache/royale/style/colors/EmeraldSwatch.as | 44 +++++++++++-----------
.../apache/royale/style/colors/FuchsiaSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/GraySwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/GreenSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/IndigoSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/LimeSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/MauveSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/MistSwatch.as | 44 +++++++++++-----------
.../apache/royale/style/colors/NeutralSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/OliveSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/OrangeSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/PinkSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/PurpleSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/RedSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/RoseSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/SkySwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/SlateSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/StoneSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/TaupeSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/TealSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/VioletSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/YellowSwatch.as | 44 +++++++++++-----------
.../org/apache/royale/style/colors/ZincSwatch.as | 44 +++++++++++-----------
.../MarginBottom.as => border/BorderColor.as} | 23 +++++++++--
.../royale/style/stylebeads/spacing/Margin.as | 2 +-
.../royale/style/stylebeads/spacing/MarginBlock.as | 2 +-
.../style/stylebeads/spacing/MarginBlockEnd.as | 2 +-
.../style/stylebeads/spacing/MarginBlockStart.as | 2 +-
.../style/stylebeads/spacing/MarginBottom.as | 2 +-
.../style/stylebeads/spacing/MarginInline.as | 2 +-
.../style/stylebeads/spacing/MarginInlineEnd.as | 2 +-
.../style/stylebeads/spacing/MarginInlineStart.as | 2 +-
.../royale/style/stylebeads/spacing/MarginLeft.as | 2 +-
.../royale/style/stylebeads/spacing/MarginRight.as | 2 +-
.../royale/style/stylebeads/spacing/MarginTop.as | 2 +-
.../royale/style/stylebeads/spacing/Padding.as | 2 +-
.../style/stylebeads/spacing/PaddingBlock.as | 2 +-
.../style/stylebeads/spacing/PaddingBlockEnd.as | 2 +-
.../style/stylebeads/spacing/PaddingBlockStart.as | 2 +-
.../style/stylebeads/spacing/PaddingBottom.as | 2 +-
.../style/stylebeads/spacing/PaddingInline.as | 2 +-
.../style/stylebeads/spacing/PaddingInlineEnd.as | 2 +-
.../style/stylebeads/spacing/PaddingInlineStart.as | 2 +-
.../royale/style/stylebeads/spacing/PaddingLeft.as | 2 +-
.../style/stylebeads/spacing/PaddingRight.as | 2 +-
.../royale/style/stylebeads/spacing/PaddingTop.as | 2 +-
50 files changed, 621 insertions(+), 602 deletions(-)
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/AmberSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/AmberSwatch.as
index d625dfa79b..76bc10577e 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/AmberSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/AmberSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.7% 0.022 95.277)";
+ return new ColorPair("amber-50","oklch(98.7% 0.022
95.277)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.2% 0.059 95.617)";
+ return new ColorPair("amber-100","oklch(96.2% 0.059
95.617)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.4% 0.12 95.746)";
+ return new ColorPair("amber-200","oklch(92.4% 0.12
95.746)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(87.9% 0.169 91.605)";
+ return new ColorPair("amber-300","oklch(87.9% 0.169
91.605)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(82.8% 0.189 84.429)";
+ return new ColorPair("amber-400","oklch(82.8% 0.189
84.429)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(76.9% 0.188 70.08)";
+ return new ColorPair("amber-500","oklch(76.9% 0.188
70.08)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(66.6% 0.179 58.318)";
+ return new ColorPair("amber-600","oklch(66.6% 0.179
58.318)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(55.5% 0.163 48.998)";
+ return new ColorPair("amber-700","oklch(55.5% 0.163
48.998)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(47.3% 0.137 46.201)";
+ return new ColorPair("amber-800","oklch(47.3% 0.137
46.201)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(41.4% 0.112 45.904)";
+ return new ColorPair("amber-900","oklch(41.4% 0.112
45.904)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(27.9% 0.077 45.635)";
+ return new ColorPair("amber-950","oklch(27.9% 0.077
45.635)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/BlueSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/BlueSwatch.as
index 4a314687a6..91fd54b880 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/BlueSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/BlueSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(97% 0.014 254.604)";
+ return new ColorPair("blue-50","oklch(97% 0.014
254.604)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(93.2% 0.032 255.585)";
+ return new ColorPair("blue-100","oklch(93.2% 0.032
255.585)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(88.2% 0.059 254.128)";
+ return new ColorPair("blue-200","oklch(88.2% 0.059
254.128)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(80.9% 0.105 251.813)";
+ return new ColorPair("blue-300","oklch(80.9% 0.105
251.813)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.7% 0.165 254.624)";
+ return new ColorPair("blue-400","oklch(70.7% 0.165
254.624)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(62.3% 0.214 259.815)";
+ return new ColorPair("blue-500","oklch(62.3% 0.214
259.815)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(54.6% 0.245 262.881)";
+ return new ColorPair("blue-600","oklch(54.6% 0.245
262.881)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(48.8% 0.243 264.376)";
+ return new ColorPair("blue-700","oklch(48.8% 0.243
264.376)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(42.4% 0.199 265.638)";
+ return new ColorPair("blue-800","oklch(42.4% 0.199
265.638)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(37.9% 0.146 265.522)";
+ return new ColorPair("blue-900","oklch(37.9% 0.146
265.522)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(28.2% 0.091 267.935)";
+ return new ColorPair("blue-950","oklch(28.2% 0.091
267.935)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlock.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/ColorPair.as
similarity index 81%
copy from
frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlock.as
copy to
frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/ColorPair.as
index ebdbabd0e2..2d81c742c4 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlock.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/ColorPair.as
@@ -16,13 +16,17 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.colors
{
- public class MarginBlock extends Margin
+ public class ColorPair
{
- public function MarginBlock()
+ public function ColorPair(name:String, value:String)
{
- super("my", "margin-block");
+ super();
+ this.name = name;
+ this.value = value;
}
+ public var name:String;
+ public var value:String;
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/CyanSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/CyanSwatch.as
index 27a3bf17f8..a969baa02f 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/CyanSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/CyanSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.4% 0.019 200.873)";
+ return new ColorPair("cyan-50","oklch(98.4% 0.019
200.873)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(95.6% 0.045 203.388)";
+ return new ColorPair("cyan-100","oklch(95.6% 0.045
203.388)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(91.7% 0.08 205.041)";
+ return new ColorPair("cyan-200","oklch(91.7% 0.08
205.041)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(86.5% 0.127 207.078)";
+ return new ColorPair("cyan-300","oklch(86.5% 0.127
207.078)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(78.9% 0.154 211.53)";
+ return new ColorPair("cyan-400","oklch(78.9% 0.154
211.53)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(71.5% 0.143 215.221)";
+ return new ColorPair("cyan-500","oklch(71.5% 0.143
215.221)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(60.9% 0.126 221.723)";
+ return new ColorPair("cyan-600","oklch(60.9% 0.126
221.723)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(52% 0.105 223.128)";
+ return new ColorPair("cyan-700","oklch(52% 0.105
223.128)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(45% 0.085 224.283)";
+ return new ColorPair("cyan-800","oklch(45% 0.085
224.283)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(39.8% 0.07 227.392)";
+ return new ColorPair("cyan-900","oklch(39.8% 0.07
227.392)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(30.2% 0.056 229.695)";
+ return new ColorPair("cyan-950","oklch(30.2% 0.056
229.695)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/EmeraldSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/EmeraldSwatch.as
index 88efea5c84..73543dc5d3 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/EmeraldSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/EmeraldSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(97.9% 0.021 166.113)";
+ return new ColorPair("emerald-50","oklch(97.9% 0.021
166.113)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(95% 0.052 163.051)";
+ return new ColorPair("emerald-100","oklch(95% 0.052
163.051)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(90.5% 0.093 164.15)";
+ return new ColorPair("emerald-200","oklch(90.5% 0.093
164.15)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(84.5% 0.143 164.978)";
+ return new ColorPair("emerald-300","oklch(84.5% 0.143
164.978)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(76.5% 0.177 163.223)";
+ return new ColorPair("emerald-400","oklch(76.5% 0.177
163.223)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(69.6% 0.17 162.48)";
+ return new ColorPair("emerald-500","oklch(69.6% 0.17
162.48)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(59.6% 0.145 163.225)";
+ return new ColorPair("emerald-600","oklch(59.6% 0.145
163.225)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(50.8% 0.118 165.612)";
+ return new ColorPair("emerald-700","oklch(50.8% 0.118
165.612)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(43.2% 0.095 166.913)";
+ return new ColorPair("emerald-800","oklch(43.2% 0.095
166.913)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(37.8% 0.077 168.94)";
+ return new ColorPair("emerald-900","oklch(37.8% 0.077
168.94)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(26.2% 0.051 172.552)";
+ return new ColorPair("emerald-950","oklch(26.2% 0.051
172.552)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/FuchsiaSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/FuchsiaSwatch.as
index 15102ff645..e77eefb339 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/FuchsiaSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/FuchsiaSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(97.7% 0.017 320.058)";
+ return new ColorPair("fuchsia-50","oklch(97.7% 0.017
320.058)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(95.2% 0.037 318.852)";
+ return new ColorPair("fuchsia-100","oklch(95.2% 0.037
318.852)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(90.3% 0.076 319.62)";
+ return new ColorPair("fuchsia-200","oklch(90.3% 0.076
319.62)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(83.3% 0.145 321.434)";
+ return new ColorPair("fuchsia-300","oklch(83.3% 0.145
321.434)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(74% 0.238 322.16)";
+ return new ColorPair("fuchsia-400","oklch(74% 0.238
322.16)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(66.7% 0.295 322.15)";
+ return new ColorPair("fuchsia-500","oklch(66.7% 0.295
322.15)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(59.1% 0.293 322.896)";
+ return new ColorPair("fuchsia-600","oklch(59.1% 0.293
322.896)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(51.8% 0.253 323.949)";
+ return new ColorPair("fuchsia-700","oklch(51.8% 0.253
323.949)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(45.2% 0.211 324.591)";
+ return new ColorPair("fuchsia-800","oklch(45.2% 0.211
324.591)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(40.1% 0.17 325.612)";
+ return new ColorPair("fuchsia-900","oklch(40.1% 0.17
325.612)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(29.3% 0.136 325.661)";
+ return new ColorPair("fuchsia-950","oklch(29.3% 0.136
325.661)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GraySwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GraySwatch.as
index 3b94a13d75..a598be031e 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GraySwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GraySwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.5% 0.002 247.839)";
+ return new ColorPair("gray-50","oklch(98.5% 0.002
247.839)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.7% 0.003 264.542)";
+ return new ColorPair("gray-100","oklch(96.7% 0.003
264.542)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.8% 0.006 264.531)";
+ return new ColorPair("gray-200","oklch(92.8% 0.006
264.531)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(87.2% 0.01 258.338)";
+ return new ColorPair("gray-300","oklch(87.2% 0.01
258.338)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.7% 0.022 261.325)";
+ return new ColorPair("gray-400","oklch(70.7% 0.022
261.325)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(55.1% 0.027 264.364)";
+ return new ColorPair("gray-500","oklch(55.1% 0.027
264.364)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(44.6% 0.03 256.802)";
+ return new ColorPair("gray-600","oklch(44.6% 0.03
256.802)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(37.3% 0.034 259.733)";
+ return new ColorPair("gray-700","oklch(37.3% 0.034
259.733)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(27.8% 0.033 256.848)";
+ return new ColorPair("gray-800","oklch(27.8% 0.033
256.848)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(21% 0.034 264.665)";
+ return new ColorPair("gray-900","oklch(21% 0.034
264.665)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(13% 0.028 261.692)";
+ return new ColorPair("gray-950","oklch(13% 0.028
261.692)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GreenSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GreenSwatch.as
index b3ad3880ae..dc56a17605 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GreenSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/GreenSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.2% 0.018 155.826)";
+ return new ColorPair("green-50","oklch(98.2% 0.018
155.826)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.2% 0.044 156.743)";
+ return new ColorPair("green-100","oklch(96.2% 0.044
156.743)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.5% 0.084 155.995)";
+ return new ColorPair("green-200","oklch(92.5% 0.084
155.995)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(87.1% 0.15 154.449)";
+ return new ColorPair("green-300","oklch(87.1% 0.15
154.449)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(79.2% 0.209 151.711)";
+ return new ColorPair("green-400","oklch(79.2% 0.209
151.711)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(72.3% 0.219 149.579)";
+ return new ColorPair("green-500","oklch(72.3% 0.219
149.579)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(62.7% 0.194 149.214)";
+ return new ColorPair("green-600","oklch(62.7% 0.194
149.214)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(52.7% 0.154 150.069)";
+ return new ColorPair("green-700","oklch(52.7% 0.154
150.069)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(44.8% 0.119 151.328)";
+ return new ColorPair("green-800","oklch(44.8% 0.119
151.328)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(39.3% 0.095 152.535)";
+ return new ColorPair("green-900","oklch(39.3% 0.095
152.535)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(26.6% 0.065 152.934)";
+ return new ColorPair("green-950","oklch(26.6% 0.065
152.934)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/IndigoSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/IndigoSwatch.as
index 8918ef20f4..54266f8bfe 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/IndigoSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/IndigoSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(96.2% 0.018 272.314)";
+ return new ColorPair("indigo-50","oklch(96.2% 0.018
272.314)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(93% 0.034 272.788)";
+ return new ColorPair("indigo-100","oklch(93% 0.034
272.788)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(87% 0.065 274.039)";
+ return new ColorPair("indigo-200","oklch(87% 0.065
274.039)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(78.5% 0.115 274.713)";
+ return new ColorPair("indigo-300","oklch(78.5% 0.115
274.713)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(67.3% 0.182 276.935)";
+ return new ColorPair("indigo-400","oklch(67.3% 0.182
276.935)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(58.5% 0.233 277.117)";
+ return new ColorPair("indigo-500","oklch(58.5% 0.233
277.117)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(51.1% 0.262 276.966)";
+ return new ColorPair("indigo-600","oklch(51.1% 0.262
276.966)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(45.7% 0.24 277.023)";
+ return new ColorPair("indigo-700","oklch(45.7% 0.24
277.023)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(39.8% 0.195 277.366)";
+ return new ColorPair("indigo-800","oklch(39.8% 0.195
277.366)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(35.9% 0.144 278.697)";
+ return new ColorPair("indigo-900","oklch(35.9% 0.144
278.697)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(25.7% 0.09 281.288)";
+ return new ColorPair("indigo-950","oklch(25.7% 0.09
281.288)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/LimeSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/LimeSwatch.as
index 38e78cf9a8..56a8700552 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/LimeSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/LimeSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.6% 0.031 120.757)";
+ return new ColorPair("lime-50","oklch(98.6% 0.031
120.757)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.7% 0.067 122.328)";
+ return new ColorPair("lime-100","oklch(96.7% 0.067
122.328)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(93.8% 0.127 124.321)";
+ return new ColorPair("lime-200","oklch(93.8% 0.127
124.321)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(89.7% 0.196 126.665)";
+ return new ColorPair("lime-300","oklch(89.7% 0.196
126.665)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(84.1% 0.238 128.85)";
+ return new ColorPair("lime-400","oklch(84.1% 0.238
128.85)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(76.8% 0.233 130.85)";
+ return new ColorPair("lime-500","oklch(76.8% 0.233
130.85)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(64.8% 0.2 131.684)";
+ return new ColorPair("lime-600","oklch(64.8% 0.2
131.684)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(53.2% 0.157 131.589)";
+ return new ColorPair("lime-700","oklch(53.2% 0.157
131.589)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(45.3% 0.124 130.933)";
+ return new ColorPair("lime-800","oklch(45.3% 0.124
130.933)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(40.5% 0.101 131.063)";
+ return new ColorPair("lime-900","oklch(40.5% 0.101
131.063)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(27.4% 0.072 132.109)";
+ return new ColorPair("lime-950","oklch(27.4% 0.072
132.109)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MauveSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MauveSwatch.as
index 82fec859d9..a01209fcfb 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MauveSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MauveSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.5% 0 0)";
+ return new ColorPair("mauve-50","oklch(98.5% 0 0)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96% 0.003 325.6)";
+ return new ColorPair("mauve-100","oklch(96% 0.003
325.6)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.2% 0.005 325.62)";
+ return new ColorPair("mauve-200","oklch(92.2% 0.005
325.62)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(86.5% 0.012 325.68)";
+ return new ColorPair("mauve-300","oklch(86.5% 0.012
325.68)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(71.1% 0.019 323.02)";
+ return new ColorPair("mauve-400","oklch(71.1% 0.019
323.02)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(54.2% 0.034 322.5)";
+ return new ColorPair("mauve-500","oklch(54.2% 0.034
322.5)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(43.5% 0.029 321.78)";
+ return new ColorPair("mauve-600","oklch(43.5% 0.029
321.78)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(36.4% 0.029 323.89)";
+ return new ColorPair("mauve-700","oklch(36.4% 0.029
323.89)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(26.3% 0.024 320.12)";
+ return new ColorPair("mauve-800","oklch(26.3% 0.024
320.12)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(21.2% 0.019 322.12)";
+ return new ColorPair("mauve-900","oklch(21.2% 0.019
322.12)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(14.5% 0.008 326)";
+ return new ColorPair("mauve-950","oklch(14.5% 0.008
326)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MistSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MistSwatch.as
index 9d0d2b1f0c..9b7f0cdce9 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MistSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/MistSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.7% 0.002 197.1)";
+ return new ColorPair("mist-50","oklch(98.7% 0.002
197.1)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.3% 0.002 197.1)";
+ return new ColorPair("mist-100","oklch(96.3% 0.002
197.1)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.5% 0.005 214.3)";
+ return new ColorPair("mist-200","oklch(92.5% 0.005
214.3)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(87.2% 0.007 219.6)";
+ return new ColorPair("mist-300","oklch(87.2% 0.007
219.6)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(72.3% 0.014 214.4)";
+ return new ColorPair("mist-400","oklch(72.3% 0.014
214.4)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(56% 0.021 213.5)";
+ return new ColorPair("mist-500","oklch(56% 0.021
213.5)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(45% 0.017 213.2)";
+ return new ColorPair("mist-600","oklch(45% 0.017
213.2)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(37.8% 0.015 216)";
+ return new ColorPair("mist-700","oklch(37.8% 0.015
216)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(27.5% 0.011 216.9)";
+ return new ColorPair("mist-800","oklch(27.5% 0.011
216.9)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(21.8% 0.008 223.9)";
+ return new ColorPair("mist-900","oklch(21.8% 0.008
223.9)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(14.8% 0.004 228.8)";
+ return new ColorPair("mist-950","oklch(14.8% 0.004
228.8)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/NeutralSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/NeutralSwatch.as
index 26ec059136..7c46e9fd36 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/NeutralSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/NeutralSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.5% 0 0)";
+ return new ColorPair("neutral-50","oklch(98.5% 0 0)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(97% 0 0)";
+ return new ColorPair("neutral-100","oklch(97% 0 0)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.2% 0 0)";
+ return new ColorPair("neutral-200","oklch(92.2% 0 0)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(87% 0 0)";
+ return new ColorPair("neutral-300","oklch(87% 0 0)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.8% 0 0)";
+ return new ColorPair("neutral-400","oklch(70.8% 0 0)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(55.6% 0 0)";
+ return new ColorPair("neutral-500","oklch(55.6% 0 0)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(43.9% 0 0)";
+ return new ColorPair("neutral-600","oklch(43.9% 0 0)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(37.1% 0 0)";
+ return new ColorPair("neutral-700","oklch(37.1% 0 0)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(26.9% 0 0)";
+ return new ColorPair("neutral-800","oklch(26.9% 0 0)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(20.5% 0 0)";
+ return new ColorPair("neutral-900","oklch(20.5% 0 0)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(14.5% 0 0)";
+ return new ColorPair("neutral-950","oklch(14.5% 0 0)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OliveSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OliveSwatch.as
index f25c20e229..c38dcb43e0 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OliveSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OliveSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.8% 0.003 106.5)";
+ return new ColorPair("olive-50","oklch(98.8% 0.003
106.5)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.6% 0.005 106.5)";
+ return new ColorPair("olive-100","oklch(96.6% 0.005
106.5)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(93% 0.007 106.5)";
+ return new ColorPair("olive-200","oklch(93% 0.007
106.5)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(88% 0.011 106.6)";
+ return new ColorPair("olive-300","oklch(88% 0.011
106.6)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(73.7% 0.021 106.9)";
+ return new ColorPair("olive-400","oklch(73.7% 0.021
106.9)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(58% 0.031 107.3)";
+ return new ColorPair("olive-500","oklch(58% 0.031
107.3)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(46.6% 0.025 107.3)";
+ return new ColorPair("olive-600","oklch(46.6% 0.025
107.3)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(39.4% 0.023 107.4)";
+ return new ColorPair("olive-700","oklch(39.4% 0.023
107.4)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(28.6% 0.016 107.4)";
+ return new ColorPair("olive-800","oklch(28.6% 0.016
107.4)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(22.8% 0.013 107.4)";
+ return new ColorPair("olive-900","oklch(22.8% 0.013
107.4)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(15.3% 0.006 107.1)";
+ return new ColorPair("olive-950","oklch(15.3% 0.006
107.1)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OrangeSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OrangeSwatch.as
index 5b9bede2ca..28a7cfcf4b 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OrangeSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/OrangeSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98% 0.016 73.684)";
+ return new ColorPair("orange-50","oklch(98% 0.016
73.684)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(95.4% 0.038 75.164)";
+ return new ColorPair("orange-100","oklch(95.4% 0.038
75.164)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(90.1% 0.076 70.697)";
+ return new ColorPair("orange-200","oklch(90.1% 0.076
70.697)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(83.7% 0.128 66.29)";
+ return new ColorPair("orange-300","oklch(83.7% 0.128
66.29)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(75% 0.183 55.934)";
+ return new ColorPair("orange-400","oklch(75% 0.183
55.934)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(70.5% 0.213 47.604)";
+ return new ColorPair("orange-500","oklch(70.5% 0.213
47.604)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(64.6% 0.222 41.116)";
+ return new ColorPair("orange-600","oklch(64.6% 0.222
41.116)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(55.3% 0.195 38.402)";
+ return new ColorPair("orange-700","oklch(55.3% 0.195
38.402)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(47% 0.157 37.304)";
+ return new ColorPair("orange-800","oklch(47% 0.157
37.304)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(40.8% 0.123 38.172)";
+ return new ColorPair("orange-900","oklch(40.8% 0.123
38.172)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(26.6% 0.079 36.259)";
+ return new ColorPair("orange-950","oklch(26.6% 0.079
36.259)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PinkSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PinkSwatch.as
index 6fd2b36b32..6d15ca34a2 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PinkSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PinkSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(97.1% 0.014 343.198)";
+ return new ColorPair("pink-50","oklch(97.1% 0.014
343.198)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(94.8% 0.028 342.258)";
+ return new ColorPair("pink-100","oklch(94.8% 0.028
342.258)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(89.9% 0.061 343.231)";
+ return new ColorPair("pink-200","oklch(89.9% 0.061
343.231)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(82.3% 0.12 346.018)";
+ return new ColorPair("pink-300","oklch(82.3% 0.12
346.018)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(71.8% 0.202 349.761)";
+ return new ColorPair("pink-400","oklch(71.8% 0.202
349.761)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(65.6% 0.241 354.308)";
+ return new ColorPair("pink-500","oklch(65.6% 0.241
354.308)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(59.2% 0.249 0.584)";
+ return new ColorPair("pink-600","oklch(59.2% 0.249
0.584)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(52.5% 0.223 3.958)";
+ return new ColorPair("pink-700","oklch(52.5% 0.223
3.958)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(45.9% 0.187 3.815)";
+ return new ColorPair("pink-800","oklch(45.9% 0.187
3.815)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(40.8% 0.153 2.432)";
+ return new ColorPair("pink-900","oklch(40.8% 0.153
2.432)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(28.4% 0.109 3.907)";
+ return new ColorPair("pink-950","oklch(28.4% 0.109
3.907)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PurpleSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PurpleSwatch.as
index 035647e4a1..de280ac96a 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PurpleSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/PurpleSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(97.7% 0.014 308.299)";
+ return new ColorPair("purple-50","oklch(97.7% 0.014
308.299)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(94.6% 0.033 307.174)";
+ return new ColorPair("purple-100","oklch(94.6% 0.033
307.174)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(90.2% 0.063 306.703)";
+ return new ColorPair("purple-200","oklch(90.2% 0.063
306.703)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(82.7% 0.119 306.383)";
+ return new ColorPair("purple-300","oklch(82.7% 0.119
306.383)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(71.4% 0.203 305.504)";
+ return new ColorPair("purple-400","oklch(71.4% 0.203
305.504)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(62.7% 0.265 303.9)";
+ return new ColorPair("purple-500","oklch(62.7% 0.265
303.9)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(55.8% 0.288 302.321)";
+ return new ColorPair("purple-600","oklch(55.8% 0.288
302.321)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(49.6% 0.265 301.924)";
+ return new ColorPair("purple-700","oklch(49.6% 0.265
301.924)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(43.8% 0.218 303.724)";
+ return new ColorPair("purple-800","oklch(43.8% 0.218
303.724)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(38.1% 0.176 304.987)";
+ return new ColorPair("purple-900","oklch(38.1% 0.176
304.987)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(29.1% 0.149 302.717)";
+ return new ColorPair("purple-950","oklch(29.1% 0.149
302.717)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RedSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RedSwatch.as
index b81e7496cd..6bbc832f39 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RedSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RedSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(97.1% 0.013 17.38)";
+ return new ColorPair("red-50","oklch(97.1% 0.013
17.38)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(93.6% 0.032 17.717)";
+ return new ColorPair("red-100","oklch(93.6% 0.032
17.717)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(88.5% 0.062 18.334)";
+ return new ColorPair("red-200","oklch(88.5% 0.062
18.334)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(80.8% 0.114 19.571)";
+ return new ColorPair("red-300","oklch(80.8% 0.114
19.571)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.4% 0.191 22.216)";
+ return new ColorPair("red-400","oklch(70.4% 0.191
22.216)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(63.7% 0.237 25.331)";
+ return new ColorPair("red-500","oklch(63.7% 0.237
25.331)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(57.7% 0.245 27.325)";
+ return new ColorPair("red-600","oklch(57.7% 0.245
27.325)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(50.5% 0.213 27.518)";
+ return new ColorPair("red-700","oklch(50.5% 0.213
27.518)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(44.4% 0.177 26.899)";
+ return new ColorPair("red-800","oklch(44.4% 0.177
26.899)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(39.6% 0.141 25.723)";
+ return new ColorPair("red-900","oklch(39.6% 0.141
25.723)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(25.8% 0.092 26.042)";
+ return new ColorPair("red-950","oklch(25.8% 0.092
26.042)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RoseSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RoseSwatch.as
index f36c492e72..f518425684 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RoseSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/RoseSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(96.9% 0.015 12.422)";
+ return new ColorPair("rose-50","oklch(96.9% 0.015
12.422)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(94.1% 0.03 12.58)";
+ return new ColorPair("rose-100","oklch(94.1% 0.03
12.58)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(89.2% 0.058 10.001)";
+ return new ColorPair("rose-200","oklch(89.2% 0.058
10.001)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(81% 0.117 11.638)";
+ return new ColorPair("rose-300","oklch(81% 0.117
11.638)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(71.2% 0.194 13.428)";
+ return new ColorPair("rose-400","oklch(71.2% 0.194
13.428)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(64.5% 0.246 16.439)";
+ return new ColorPair("rose-500","oklch(64.5% 0.246
16.439)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(58.6% 0.253 17.585)";
+ return new ColorPair("rose-600","oklch(58.6% 0.253
17.585)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(51.4% 0.222 16.935)";
+ return new ColorPair("rose-700","oklch(51.4% 0.222
16.935)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(45.5% 0.188 13.697)";
+ return new ColorPair("rose-800","oklch(45.5% 0.188
13.697)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(41% 0.159 10.272)";
+ return new ColorPair("rose-900","oklch(41% 0.159
10.272)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(27.1% 0.105 12.094)";
+ return new ColorPair("rose-950","oklch(27.1% 0.105
12.094)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SkySwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SkySwatch.as
index 8090dcb3ff..c9aed89c6b 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SkySwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SkySwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(97.7% 0.013 236.62)";
+ return new ColorPair("sky-50","oklch(97.7% 0.013
236.62)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(95.1% 0.026 236.824)";
+ return new ColorPair("sky-100","oklch(95.1% 0.026
236.824)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(90.1% 0.058 230.902)";
+ return new ColorPair("sky-200","oklch(90.1% 0.058
230.902)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(82.8% 0.111 230.318)";
+ return new ColorPair("sky-300","oklch(82.8% 0.111
230.318)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(74.6% 0.16 232.661)";
+ return new ColorPair("sky-400","oklch(74.6% 0.16
232.661)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(68.5% 0.169 237.323)";
+ return new ColorPair("sky-500","oklch(68.5% 0.169
237.323)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(58.8% 0.158 241.966)";
+ return new ColorPair("sky-600","oklch(58.8% 0.158
241.966)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(50% 0.134 242.749)";
+ return new ColorPair("sky-700","oklch(50% 0.134
242.749)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(44.3% 0.11 240.79)";
+ return new ColorPair("sky-800","oklch(44.3% 0.11
240.79)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(39.1% 0.09 240.876)";
+ return new ColorPair("sky-900","oklch(39.1% 0.09
240.876)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(29.3% 0.066 243.157)";
+ return new ColorPair("sky-950","oklch(29.3% 0.066
243.157)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SlateSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SlateSwatch.as
index c0e7e7af79..14a681d2cf 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SlateSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/SlateSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.4% 0.003 247.858)";
+ return new ColorPair("slate-50","oklch(98.4% 0.003
247.858)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.8% 0.007 247.896)";
+ return new ColorPair("slate-100","oklch(96.8% 0.007
247.896)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.9% 0.013 255.508)";
+ return new ColorPair("slate-200","oklch(92.9% 0.013
255.508)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(86.9% 0.022 252.894)";
+ return new ColorPair("slate-300","oklch(86.9% 0.022
252.894)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.4% 0.04 256.788)";
+ return new ColorPair("slate-400","oklch(70.4% 0.04
256.788)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(55.4% 0.046 257.417)";
+ return new ColorPair("slate-500","oklch(55.4% 0.046
257.417)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(44.6% 0.043 257.281)";
+ return new ColorPair("slate-600","oklch(44.6% 0.043
257.281)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(37.2% 0.044 257.287)";
+ return new ColorPair("slate-700","oklch(37.2% 0.044
257.287)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(27.9% 0.041 260.031)";
+ return new ColorPair("slate-800","oklch(27.9% 0.041
260.031)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(20.8% 0.042 265.755)";
+ return new ColorPair("slate-900","oklch(20.8% 0.042
265.755)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(12.9% 0.042 264.695)";
+ return new ColorPair("slate-950","oklch(12.9% 0.042
264.695)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/StoneSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/StoneSwatch.as
index b8f42ff861..411b606f2a 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/StoneSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/StoneSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.5% 0.001 106.423)";
+ return new ColorPair("stone-50","oklch(98.5% 0.001
106.423)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(97% 0.001 106.424)";
+ return new ColorPair("stone-100","oklch(97% 0.001
106.424)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.3% 0.003 48.717)";
+ return new ColorPair("stone-200","oklch(92.3% 0.003
48.717)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(86.9% 0.005 56.366)";
+ return new ColorPair("stone-300","oklch(86.9% 0.005
56.366)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.9% 0.01 56.259)";
+ return new ColorPair("stone-400","oklch(70.9% 0.01
56.259)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(55.3% 0.013 58.071)";
+ return new ColorPair("stone-500","oklch(55.3% 0.013
58.071)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(44.4% 0.011 73.639)";
+ return new ColorPair("stone-600","oklch(44.4% 0.011
73.639)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(37.4% 0.01 67.558)";
+ return new ColorPair("stone-700","oklch(37.4% 0.01
67.558)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(26.8% 0.007 34.298)";
+ return new ColorPair("stone-800","oklch(26.8% 0.007
34.298)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(21.6% 0.006 56.043)";
+ return new ColorPair("stone-900","oklch(21.6% 0.006
56.043)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(14.7% 0.004 49.25)";
+ return new ColorPair("stone-950","oklch(14.7% 0.004
49.25)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TaupeSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TaupeSwatch.as
index cc6c8aa500..a11fbfd901 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TaupeSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TaupeSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.6% 0.002 67.8)";
+ return new ColorPair("taupe-50","oklch(98.6% 0.002
67.8)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96% 0.002 17.2)";
+ return new ColorPair("taupe-100","oklch(96% 0.002
17.2)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92.2% 0.005 34.3)";
+ return new ColorPair("taupe-200","oklch(92.2% 0.005
34.3)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(86.8% 0.007 39.5)";
+ return new ColorPair("taupe-300","oklch(86.8% 0.007
39.5)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(71.4% 0.014 41.2)";
+ return new ColorPair("taupe-400","oklch(71.4% 0.014
41.2)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(54.7% 0.021 43.1)";
+ return new ColorPair("taupe-500","oklch(54.7% 0.021
43.1)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(43.8% 0.017 39.3)";
+ return new ColorPair("taupe-600","oklch(43.8% 0.017
39.3)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(36.7% 0.016 35.7)";
+ return new ColorPair("taupe-700","oklch(36.7% 0.016
35.7)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(26.8% 0.011 36.5)";
+ return new ColorPair("taupe-800","oklch(26.8% 0.011
36.5)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(21.4% 0.009 43.1)";
+ return new ColorPair("taupe-900","oklch(21.4% 0.009
43.1)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(14.7% 0.004 49.3)";
+ return new ColorPair("taupe-950","oklch(14.7% 0.004
49.3)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TealSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TealSwatch.as
index af0f1cbffd..765072da6b 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TealSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/TealSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.4% 0.014 180.72)";
+ return new ColorPair("teal-50","oklch(98.4% 0.014
180.72)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(95.3% 0.051 180.801)";
+ return new ColorPair("teal-100","oklch(95.3% 0.051
180.801)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(91% 0.096 180.426)";
+ return new ColorPair("teal-200","oklch(91% 0.096
180.426)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(85.5% 0.138 181.071)";
+ return new ColorPair("teal-300","oklch(85.5% 0.138
181.071)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(77.7% 0.152 181.912)";
+ return new ColorPair("teal-400","oklch(77.7% 0.152
181.912)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(70.4% 0.14 182.503)";
+ return new ColorPair("teal-500","oklch(70.4% 0.14
182.503)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(60% 0.118 184.704)";
+ return new ColorPair("teal-600","oklch(60% 0.118
184.704)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(51.1% 0.096 186.391)";
+ return new ColorPair("teal-700","oklch(51.1% 0.096
186.391)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(43.7% 0.078 188.216)";
+ return new ColorPair("teal-800","oklch(43.7% 0.078
188.216)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(38.6% 0.063 188.416)";
+ return new ColorPair("teal-900","oklch(38.6% 0.063
188.416)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(27.7% 0.046 192.524)";
+ return new ColorPair("teal-950","oklch(27.7% 0.046
192.524)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/VioletSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/VioletSwatch.as
index 9d45c5f56f..37c9a32da8 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/VioletSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/VioletSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(96.9% 0.016 293.756)";
+ return new ColorPair("violet-50","oklch(96.9% 0.016
293.756)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(94.3% 0.029 294.588)";
+ return new ColorPair("violet-100","oklch(94.3% 0.029
294.588)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(89.4% 0.057 293.283)";
+ return new ColorPair("violet-200","oklch(89.4% 0.057
293.283)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(81.1% 0.111 293.571)";
+ return new ColorPair("violet-300","oklch(81.1% 0.111
293.571)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.2% 0.183 293.541)";
+ return new ColorPair("violet-400","oklch(70.2% 0.183
293.541)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(60.6% 0.25 292.717)";
+ return new ColorPair("violet-500","oklch(60.6% 0.25
292.717)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(54.1% 0.281 293.009)";
+ return new ColorPair("violet-600","oklch(54.1% 0.281
293.009)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(49.1% 0.27 292.581)";
+ return new ColorPair("violet-700","oklch(49.1% 0.27
292.581)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(43.2% 0.232 292.759)";
+ return new ColorPair("violet-800","oklch(43.2% 0.232
292.759)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(38% 0.189 293.745)";
+ return new ColorPair("violet-900","oklch(38% 0.189
293.745)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(28.3% 0.141 291.089)";
+ return new ColorPair("violet-950","oklch(28.3% 0.141
291.089)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/YellowSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/YellowSwatch.as
index 6957879a88..9a8930d5f3 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/YellowSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/YellowSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.7% 0.026 102.212)";
+ return new ColorPair("yellow-50","oklch(98.7% 0.026
102.212)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(97.3% 0.071 103.193)";
+ return new ColorPair("yellow-100","oklch(97.3% 0.071
103.193)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(94.5% 0.129 101.54)";
+ return new ColorPair("yellow-200","oklch(94.5% 0.129
101.54)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(90.5% 0.182 98.111)";
+ return new ColorPair("yellow-300","oklch(90.5% 0.182
98.111)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(85.2% 0.199 91.936)";
+ return new ColorPair("yellow-400","oklch(85.2% 0.199
91.936)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(79.5% 0.184 86.047)";
+ return new ColorPair("yellow-500","oklch(79.5% 0.184
86.047)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(68.1% 0.162 75.834)";
+ return new ColorPair("yellow-600","oklch(68.1% 0.162
75.834)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(55.4% 0.135 66.442)";
+ return new ColorPair("yellow-700","oklch(55.4% 0.135
66.442)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(47.6% 0.114 61.907)";
+ return new ColorPair("yellow-800","oklch(47.6% 0.114
61.907)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(42.1% 0.095 57.708)";
+ return new ColorPair("yellow-900","oklch(42.1% 0.095
57.708)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(28.6% 0.066 53.813)";
+ return new ColorPair("yellow-950","oklch(28.6% 0.066
53.813)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/ZincSwatch.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/ZincSwatch.as
index 087bbe6c31..fe1f16069a 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/ZincSwatch.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/colors/ZincSwatch.as
@@ -28,59 +28,59 @@ package org.apache.royale.style.colors
}
COMPILE::JS
- public static function get _50():String
+ public static function get _50():ColorPair
{
- return "oklch(98.5% 0 0)";
+ return new ColorPair("zinc-50","oklch(98.5% 0 0)") ;
}
COMPILE::JS
- public static function get _100():String
+ public static function get _100():ColorPair
{
- return "oklch(96.7% 0.001 286.375)";
+ return new ColorPair("zinc-100","oklch(96.7% 0.001
286.375)") ;
}
COMPILE::JS
- public static function get _200():String
+ public static function get _200():ColorPair
{
- return "oklch(92% 0.004 286.32)";
+ return new ColorPair("zinc-200","oklch(92% 0.004
286.32)") ;
}
COMPILE::JS
- public static function get _300():String
+ public static function get _300():ColorPair
{
- return "oklch(87.1% 0.006 286.286)";
+ return new ColorPair("zinc-300","oklch(87.1% 0.006
286.286)") ;
}
COMPILE::JS
- public static function get _400():String
+ public static function get _400():ColorPair
{
- return "oklch(70.5% 0.015 286.067)";
+ return new ColorPair("zinc-400","oklch(70.5% 0.015
286.067)") ;
}
COMPILE::JS
- public static function get _500():String
+ public static function get _500():ColorPair
{
- return "oklch(55.2% 0.016 285.938)";
+ return new ColorPair("zinc-500","oklch(55.2% 0.016
285.938)") ;
}
COMPILE::JS
- public static function get _600():String
+ public static function get _600():ColorPair
{
- return "oklch(44.2% 0.017 285.786)";
+ return new ColorPair("zinc-600","oklch(44.2% 0.017
285.786)") ;
}
COMPILE::JS
- public static function get _700():String
+ public static function get _700():ColorPair
{
- return "oklch(37% 0.013 285.805)";
+ return new ColorPair("zinc-700","oklch(37% 0.013
285.805)") ;
}
COMPILE::JS
- public static function get _800():String
+ public static function get _800():ColorPair
{
- return "oklch(27.4% 0.006 286.033)";
+ return new ColorPair("zinc-800","oklch(27.4% 0.006
286.033)") ;
}
COMPILE::JS
- public static function get _900():String
+ public static function get _900():ColorPair
{
- return "oklch(21% 0.006 285.885)";
+ return new ColorPair("zinc-900","oklch(21% 0.006
285.885)") ;
}
COMPILE::JS
- public static function get _950():String
+ public static function get _950():ColorPair
{
- return "oklch(14.1% 0.005 285.823)";
+ return new ColorPair("zinc-950","oklch(14.1% 0.005
285.823)") ;
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBottom.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderColor.as
similarity index 59%
copy from
frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBottom.as
copy to
frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderColor.as
index a08e1d36ab..edc6832057 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBottom.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderColor.as
@@ -16,13 +16,28 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.background
{
- public class MarginBottom extends Margin
+ import org.apache.royale.style.stylebeads.SingleStyleBase;
+ import org.apache.royale.debugging.assert;
+ import org.apache.royale.style.colors.ColorPair;
+
+ public class BorderColor extends SingleStyleBase
{
- public function MarginBottom()
+ public function BorderColor()
{
- super("mb", "margin-bottom");
+ super("border", "border-color");
+ }
+ /**
+ * @royaleignorecoercion
org.apache.royale.style.colors.ColorPair
+ */
+ override public function set value(value:*):void
+ {
+ assert(value is ColorPair, "The value must be a
ColorPair: " + value);
+ _value = value;
+ var pair:ColorPair = value as ColorPair;
+ calculatedRuleValue = pair.value;
+ calculatedSelector = pair.name;
}
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as
index c9fe33c3b4..b8fff8cce3 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Margin.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
import org.apache.royale.style.stylebeads.SingleStyleBase;
import org.apache.royale.debugging.assert;
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlock.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlock.as
index ebdbabd0e2..f2c49fa4d0 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlock.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlock.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginBlock extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockEnd.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockEnd.as
index 49201a81fa..cc17006c0c 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockEnd.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockEnd.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginBlockEnd extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockStart.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockStart.as
index 6bbe137129..09c2561941 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockStart.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBlockStart.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginBlockStart extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBottom.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBottom.as
index a08e1d36ab..48af939c2e 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBottom.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginBottom.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginBottom extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInline.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInline.as
index d912b04019..2c4eb35714 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInline.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInline.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginInline extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineEnd.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineEnd.as
index 6d29fd97d4..e86dc0791b 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineEnd.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineEnd.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginInlineEnd extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineStart.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineStart.as
index 4384023e57..702b54928b 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineStart.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginInlineStart.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginInlineStart extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginLeft.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginLeft.as
index 1001d63cee..8ff80898d3 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginLeft.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginLeft.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginLeft extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginRight.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginRight.as
index d547732825..3c706f8cc4 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginRight.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginRight.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginRight extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginTop.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginTop.as
index 014d99b051..af28703438 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginTop.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/MarginTop.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class MarginTop extends Margin
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as
index 4488028c46..55c4b2a0ea 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/Padding.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
import org.apache.royale.style.stylebeads.SingleStyleBase;
import org.apache.royale.debugging.assert;
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlock.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlock.as
index be62d12108..22657ea0c4 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlock.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlock.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingBlock extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockEnd.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockEnd.as
index a6c6e72a46..0d2502a42d 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockEnd.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockEnd.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingBlockEnd extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockStart.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockStart.as
index 1a66ba291c..c2ea436eac 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockStart.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBlockStart.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingBlockStart extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBottom.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBottom.as
index 85faa1fb86..c8bd2318bf 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBottom.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingBottom.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingBottom extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInline.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInline.as
index 4331d95f2a..69c883cb53 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInline.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInline.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingInline extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineEnd.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineEnd.as
index 9c7a84027d..bf38ffa521 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineEnd.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineEnd.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingInlineEnd extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineStart.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineStart.as
index 37f5e7f370..8fe4215001 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineStart.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingInlineStart.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingInlineStart extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingLeft.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingLeft.as
index 06ed589997..0c469a7325 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingLeft.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingLeft.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingLeft extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingRight.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingRight.as
index 63a76ba6a6..a7c272fcc5 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingRight.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingRight.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingRight extends Padding
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingTop.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingTop.as
index adf470ca49..b7d5ab9606 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingTop.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/spacing/PaddingTop.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.flexgrid
+package org.apache.royale.style.stylebeads.spacing
{
public class PaddingTop extends Padding
{