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 1342927 jewel some card, label and example changes
1342927 is described below
commit 1342927eb37bb6c23cd4b54d965070282881b2be
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Jun 7 12:07:51 2018 +0200
jewel some card, label and example changes
---
examples/royale/JewelExample/pom.xml | 1 +
.../src/main/royale/LabelPlayGround.mxml | 6 +++-
.../projects/Jewel/src/main/resources/defaults.css | 32 ++++++----------------
.../Jewel/src/main/sass/components/_card.sass | 16 +++++++++++
.../JewelTheme/src/main/resources/defaults.css | 16 +++--------
.../src/main/sass/components-primary/_card.sass | 12 ++------
6 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/examples/royale/JewelExample/pom.xml
b/examples/royale/JewelExample/pom.xml
index becaaa7..d597e71 100644
--- a/examples/royale/JewelExample/pom.xml
+++ b/examples/royale/JewelExample/pom.xml
@@ -44,6 +44,7 @@
<targets>JSRoyale,SWF</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
+
<additionalCompilerOptions>-source-map=true</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
diff --git a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
index 0f89c12..547469f 100644
--- a/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/LabelPlayGround.mxml
@@ -19,7 +19,8 @@ limitations under the License.
-->
<j:Card xmlns:fx="http://ns.adobe.com/mxml/2009";
xmlns:j="library://ns.apache.org/royale/jewel"
- xmlns:html="library://ns.apache.org/royale/html">
+ xmlns:html="library://ns.apache.org/royale/html"
+ width="320">
<fx:Script>
<![CDATA[
@@ -35,5 +36,8 @@ limitations under the License.
<html:H3 text="Jewel Label"/>
<j:Label id="label" text="This is a Label" click="labelClick(event)"/>
+
+ <j:Label text="This is a multiline label with more text that wraps if
container has set a width"
+ multiline="true"/>
</j:Card>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 7b0c208..2c9e035 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -76,49 +76,27 @@ j|Container {
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- margin: 0;
- padding: 0;
- max-width: 100%;
- max-height: 100%;
min-width: 350px;
min-height: 200px;
- border: 0px solid;
- border-radius: 3px;
- box-shadow: 0px 6px 60px -10px rgba(112, 112, 112, 0.7);
- background-color: #FFFFFF;
}
.jewel.alert .jewel.titlebar {
- padding: 14px 14px 0px 14px;
height: 50px;
- color: #000000;
}
-.jewel.alert .jewel.titlebar .jewel.label {
- font-size: 1.9em;
- font-weight: bold;
-}
-.jewel.alert .Group {
+.jewel.alert .content {
position: absolute;
- padding: 14px;
top: 50px;
bottom: 50px;
width: 100%;
overflow-y: auto;
}
-.jewel.alert .Group .jewel.label {
+.jewel.alert .content .jewel.label {
white-space: normal;
- color: #000000;
- font-size: 1.1em;
- font-weight: normal;
}
.jewel.alert .jewel.controlbar {
- padding: 0px 14px 14px 14px;
position: absolute;
bottom: 0;
height: 50px;
}
-.jewel.alert + .backdrop {
- background-color: rgba(0, 0, 0, 0.5);
-}
j|Alert {
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.AlertModel");
@@ -126,6 +104,12 @@ j|Alert {
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.AlertView");
}
+.jewel.card {
+ flex-direction: column;
+ min-width: 320px;
+ min-height: 180px;
+}
+
j|Card {
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout");
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
index 6845890..22c74d2 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
@@ -17,6 +17,22 @@
//
////////////////////////////////////////////////////////////////////////////////
+// Jewel Card
+
+// Card variables
+$card-width: 320px !default
+$card-height: 180px !default
+
+.jewel.card
+ flex-direction: column
+
+ min-width: $card-width
+ min-height: $card-height
+
+ //overflow: hidden
+ //position: relative
+ //z-index: 1
+
j|Card
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 253b8c0..8747025 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -49,14 +49,8 @@ div {
}
.jewel.alert {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
margin: 0;
padding: 0;
- max-width: 100%;
- max-height: 100%;
min-width: 420px;
min-height: 240px;
border: 0px solid;
@@ -74,12 +68,9 @@ div {
font-weight: bold;
}
.jewel.alert .content {
- position: absolute;
padding: 20px;
top: 50px;
bottom: 80px;
- width: 100%;
- overflow-y: auto;
}
.jewel.alert .content .jewel.label {
white-space: normal;
@@ -196,9 +187,6 @@ div {
}
.jewel.card {
- flex-direction: column;
- min-width: 300px;
- min-height: 100px;
font-size: 14px;
font-weight: 400;
background: #ebebeb;
@@ -223,6 +211,7 @@ j|Card {
-webkit-appearance: none;
-moz-appearance: none;
-o-appearance: none;
+ -ms-appearance: none;
appearance: none;
cursor: pointer;
display: inline-block;
@@ -358,6 +347,7 @@ j|Card {
-webkit-appearance: none;
-moz-appearance: none;
-o-appearance: none;
+ -ms-appearance: none;
appearance: none;
cursor: pointer;
display: inline-block;
@@ -428,6 +418,7 @@ j|Card {
-webkit-appearance: none;
-moz-appearance: none;
-o-appearance: none;
+ -ms-appearance: none;
appearance: none;
outline: 0;
align-self: center;
@@ -528,6 +519,7 @@ j|Card {
-webkit-appearance: none;
-moz-appearance: none;
-o-appearance: none;
+ -ms-appearance: none;
appearance: none;
margin: 0;
padding: 0.67em 1em;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
index 2ec1ae9..0fe5f97 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
@@ -20,16 +20,10 @@
// Jewel Card
// Card variables
+// $card-width: 320px !default
+// $card-height: 180px !default
+
.jewel.card
- flex-direction: column
-
- min-width: 300px
- min-height: 100px
-
- //overflow: hidden
- //position: relative
- //z-index: 1
-
font:
size: $font-size
weight: 400
--
To stop receiving notification emails like this one, please contact
[email protected].
