You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/11/10 15:00:49 UTC
[royale-asjs] branch develop updated: make theme styles for
formitem and formheading
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new e2e27b0 make theme styles for formitem and formheading
e2e27b0 is described below
commit e2e27b0bbfd4ce3655ee6b55aa0ff44c837c7a6b
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Nov 10 16:00:41 2018 +0100
make theme styles for formitem and formheading
---
.../projects/Jewel/src/main/resources/defaults.css | 21 ---------------
.../src/main/sass/components/_formheading.sass | 9 ++-----
.../Jewel/src/main/sass/components/_formitem.sass | 10 +-------
.../JewelTheme/src/main/resources/defaults.css | 30 ++++++++++++++++++++++
.../sass/components-primary}/_formheading.sass | 6 +----
.../main/sass/components-primary}/_formitem.sass | 10 +-------
.../themes/JewelTheme/src/main/sass/defaults.sass | 2 ++
7 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index d02a8d3..be61edd 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -718,32 +718,13 @@ j|DropDownList {
}
}
.jewel.formheading {
- color: #3CADF1;
- font-size: 1.4em !important;
line-height: 2em;
}
-.jewel.formheading .jewel.label.spacerLabel {
- width: 160px;
-}
-.jewel.formheading .jewel.label.requiredSpacerLabel {
- width: 10px;
-}
j|FormHeading {
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout");
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.FormHeadingView");
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.TextModel");
- gap: 3;
- itemsVerticalAlign: itemsCentered;
-}
-
-.jewel.formitem .jewel.label.formlabel {
- width: 160px;
-}
-.jewel.formitem .jewel.label.required {
- color: red;
- font-size: 1.6em !important;
- width: 10px;
}
j|FormItem {
@@ -752,8 +733,6 @@ j|FormItem {
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.FormItemModel");
IFormItemContentArea: ClassReference("org.apache.royale.jewel.Group");
IFormItemLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout");
- gap: 3;
- itemsVerticalAlign: itemsCentered;
}
.fonticon {
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass b/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
index 4b52d4d..d1a6fef 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
@@ -22,18 +22,13 @@
// FormHeading variables
.jewel.formheading
- color: #3CADF1
- font-size: 1.4em !important
line-height: 2em
.jewel.label.spacerLabel
- width: 160px
+
.jewel.label.requiredSpacerLabel
- width: 10px
j|FormHeading
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.FormHeadingView")
- IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.TextModel")
- gap: 3
- itemsVerticalAlign: itemsCentered
\ No newline at end of file
+ IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.TextModel")
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass b/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
index ca9b332..5d390b6 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
@@ -24,14 +24,8 @@
.jewel.formitem
.jewel.label.formlabel
- width: 160px
.jewel.label.required
- color: red
- font-size: 1.6em !important
- width: 10px
-
- .content
j|FormItem
@@ -39,6 +33,4 @@ j|FormItem
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.FormItemView")
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.FormItemModel")
IFormItemContentArea: ClassReference("org.apache.royale.jewel.Group")
- IFormItemLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
- gap: 3
- itemsVerticalAlign: itemsCentered
\ No newline at end of file
+ IFormItemLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index cb66d52..df38d42 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -399,6 +399,36 @@ j|Card {
border: 1px solid #0f88d1;
}
+.jewel.formheading {
+ color: #1198e9;
+ font-size: 1.4em !important;
+}
+.jewel.formheading .jewel.label.spacerLabel {
+ width: 160px;
+}
+.jewel.formheading .jewel.label.requiredSpacerLabel {
+ width: 10px;
+}
+
+j|FormHeading {
+ gap: 3;
+ itemsVerticalAlign: itemsCentered;
+}
+
+.jewel.formitem .jewel.label.formlabel {
+ width: 160px;
+}
+.jewel.formitem .jewel.label.required {
+ color: #EC1C24;
+ font-size: 1.6em !important;
+ width: 10px;
+}
+
+j|FormItem {
+ gap: 3;
+ itemsVerticalAlign: itemsCentered;
+}
+
.fonticon.dark {
color: #676767;
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formheading.sass
similarity index 78%
copy from frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
copy to frameworks/themes/JewelTheme/src/main/sass/components-primary/_formheading.sass
index 4b52d4d..fd0712a 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formheading.sass
@@ -22,9 +22,8 @@
// FormHeading variables
.jewel.formheading
- color: #3CADF1
+ color: darken($primary-color, 10%)
font-size: 1.4em !important
- line-height: 2em
.jewel.label.spacerLabel
width: 160px
@@ -32,8 +31,5 @@
width: 10px
j|FormHeading
- IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
- IBeadView: ClassReference("org.apache.royale.jewel.beads.views.FormHeadingView")
- IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.TextModel")
gap: 3
itemsVerticalAlign: itemsCentered
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formitem.sass
similarity index 70%
copy from frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
copy to frameworks/themes/JewelTheme/src/main/sass/components-primary/_formitem.sass
index ca9b332..d0f8209 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formitem.sass
@@ -27,18 +27,10 @@
width: 160px
.jewel.label.required
- color: red
+ color: $error-color
font-size: 1.6em !important
width: 10px
- .content
-
-
j|FormItem
- IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
- IBeadView: ClassReference("org.apache.royale.jewel.beads.views.FormItemView")
- IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.FormItemModel")
- IFormItemContentArea: ClassReference("org.apache.royale.jewel.Group")
- IFormItemLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
gap: 3
itemsVerticalAlign: itemsCentered
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
index 1a0b58d..9b787bc 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
@@ -37,6 +37,8 @@
@import "components-primary/divider"
@import "components-primary/drawer"
@import "components-primary/dropdownlist"
+@import "components-primary/formheading"
+@import "components-primary/formitem"
@import "components-primary/icons"
@import "components-primary/itemRenderer"
@import "components-primary/label"