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 d465081 jewel-label: refactor styles to be more flexible
d465081 is described below
commit d465081f081d6fdc624dc1266813ccadc09793d8
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Feb 8 13:33:26 2020 +0100
jewel-label: refactor styles to be more flexible
---
.../projects/Jewel/src/main/resources/defaults.css | 10 ++++------
frameworks/projects/Jewel/src/main/sass/_global.sass | 6 ------
.../Jewel/src/main/sass/components/_label.sass | 5 +++++
.../themes/JewelTheme/src/main/resources/defaults.css | 6 +++++-
.../src/main/sass/components-primary/_label.sass | 19 +++++++++++++------
5 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 5d33c43..7adba5d 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -138,12 +138,6 @@ hr {
height: 1px;
}
-.jewel.multiline {
- white-space: pre-wrap !important;
- word-wrap: break-word;
- max-width: 100%;
-}
-
.responsiveSizeMonitor {
background: rgba(0, 0, 0, 0.8);
color: white;
@@ -964,6 +958,10 @@ j|ImageButton {
cursor: default;
white-space: nowrap;
}
+.jewel.label.multiline {
+ white-space: pre-wrap;
+ word-wrap: break-word;
+}
j|Label {
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.TextModel");
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass
b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 8d33802..1b643ec 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -140,12 +140,6 @@ hr
border: 0
height: 1px
-.jewel
- &.multiline
- white-space: pre-wrap !important
- word-wrap: break-word
- max-width: 100%
-
.responsiveSizeMonitor
background: rgba(0,0,0,0.8)
color: white
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_label.sass
b/frameworks/projects/Jewel/src/main/sass/components/_label.sass
index 1d0e9fb..285f035 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_label.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_label.sass
@@ -18,10 +18,15 @@
////////////////////////////////////////////////////////////////////////////////
.jewel
+
&.label
cursor: default
white-space: nowrap
+ &.multiline
+ white-space: pre-wrap
+ word-wrap: break-word
+
j|Label
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.TextModel")
//IMeasurementBead:
ClassReference("org.apache.royale.html.beads.TextFieldLabelMeasurementBead")
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 7a6fae8..2df61a5 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -633,7 +633,11 @@ j|FormItem {
}
.jewel.label {
- font-size: 1em;
+ line-height: 1em;
+}
+.jewel.label.multiline {
+ line-height: normal;
+ max-width: 100%;
}
.jewel.list {
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_label.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_label.sass
index e53fb2f..5d78f8f 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_label.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_label.sass
@@ -17,11 +17,18 @@
//
////////////////////////////////////////////////////////////////////////////////
+.jewel
+
+ &.label
+ // font:
+ // family: $font-stack
+ // size: $font-size
+ line-height: $font-size
+
+ &.multiline
+ line-height: normal
+ max-width: 100%
+
j|Label
//IBeadView:
ClassReference("org.apache.royale.html.beads.textinputView")
- //IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.LabelViewBead")
-
-.jewel.label
- font:
- // family: $font-stack
- size: $font-size
\ No newline at end of file
+ //IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.LabelViewBead")
\ No newline at end of file
