This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/jewel-ui-set by this
push:
new 6de4a41 alert more changes
6de4a41 is described below
commit 6de4a41eea9d3c4d9b0aa3aa38f09d56a0fd476e
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Mar 31 11:52:34 2018 +0200
alert more changes
---
.../projects/Jewel/src/main/resources/defaults.css | 22 +++++++++-----
.../apache/royale/jewel/beads/views/AlertView.as | 34 +++++++++++-----------
.../Jewel/src/main/sass/components/_alert.sass | 32 ++++++++++----------
3 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 21ab0c8..2aa6697 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -49,9 +49,12 @@
max-width: 100%;
max-height: 100%;
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: 10px 10px 0px 10px;
+ padding: 14px 14px 0px 14px;
height: 50px;
}
.jewel.alert .jewel.titlebar .jewel.label {
@@ -63,9 +66,13 @@
min-width: 16px;
min-height: 16px;
padding: 4px;
- background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 14 14'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-829,
-278)'><g fill='#777777' transform='translate(825, 274)'><path
d='M15.9921875,18 C15.8133104,18 11,13.05896 11,13.05896 C11,13.05896
6.20438984,18 6.0255127,18 C5.84663556,18 4,16.2295363 4,16.0506592
C4,15.871782 9.07348633,11 9.07348633,11 C9.07348633,11 4,6.21037128
4,6.03149414 C4,5.852617 5.84663556,4.05688477 6.0255127,4.05688477 C6.2043
[...]
+ background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 14 14'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-829,
-278)'><g fill='#555555' transform='translate(825, 274)'><path
d='M15.9921875,18 C15.8133104,18 11,13.05896 11,13.05896 C11,13.05896
6.20438984,18 6.0255127,18 C5.84663556,18 4,16.2295363 4,16.0506592
C4,15.871782 9.07348633,11 9.07348633,11 C9.07348633,11 4,6.21037128
4,6.03149414 C4,5.852617 5.84663556,4.05688477 6.0255127,4.05688477 C6.2043
[...]
background-repeat: no-repeat;
background-attachment: fixed;
+ box-shadow: none;
+}
+.jewel.alert .jewel.titlebar .closebutton:hover {
+ background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 14 14'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-829,
-278)'><g fill='#777777' transform='translate(825, 274)'><path
d='M15.9921875,18 C15.8133104,18 11,13.05896 11,13.05896 C11,13.05896
6.20438984,18 6.0255127,18 C5.84663556,18 4,16.2295363 4,16.0506592
C4,15.871782 9.07348633,11 9.07348633,11 C9.07348633,11 4,6.21037128
4,6.03149414 C4,5.852617 5.84663556,4.05688477 6.0255127,4.05688477 C6.2043
[...]
}
.jewel.alert .Group {
position: absolute;
@@ -73,19 +80,20 @@
top: 50px;
bottom: 50px;
overflow-y: auto;
- padding: 10px;
+ padding: 14px;
}
.jewel.alert .Group .jewel.label {
font-size: 1.1em;
}
.jewel.alert .jewel.controlbar {
- padding: 0px 10px 10px 10px;
+ padding: 0px 14px 14px 14px;
position: absolute;
+ right: 0;
bottom: 0;
- width: 100%;
height: 50px;
- display: flex;
- flex-direction: row-reverse;
+}
+.jewel.alert .jewel.controlbar > * {
+ margin-left: 6px;
}
.jewel.alert + .backdrop {
background-color: rgba(0, 0, 0, 0.5);
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index f314559..a028027 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -156,20 +156,11 @@ package org.apache.royale.jewel.beads.views
COMPILE::JS
{
controlBar = new ControlBar();
- controlBar.addBead(new
HorizontalLayoutSpaceBetween());
+ //controlBar.addBead(new
HorizontalLayoutSpaceBetween());
}
var flags:uint = alertModel.flags;
- if( flags & Alert.CANCEL )
- {
- cancelButton = new TextButton();
- cancelButton.text = alertModel.cancelLabel;
- cancelButton.addEventListener("click", handleCancel);
-
- controlBar.addElement(cancelButton);
- }
-
if( flags & Alert.OK )
{
okButton = new TextButton();
@@ -179,16 +170,16 @@ package org.apache.royale.jewel.beads.views
controlBar.addElement(okButton);
}
-
- if( flags & Alert.NO )
+
+ if( flags & Alert.CANCEL )
{
- noButton = new TextButton();
- noButton.text = alertModel.noLabel;
- noButton.addEventListener("click", handleNo);
+ cancelButton = new TextButton();
+ cancelButton.text = alertModel.cancelLabel;
+ cancelButton.addEventListener("click", handleCancel);
- controlBar.addElement(noButton);
+ controlBar.addElement(cancelButton);
}
-
+
if( flags & Alert.YES )
{
yesButton = new TextButton();
@@ -198,6 +189,15 @@ package org.apache.royale.jewel.beads.views
controlBar.addElement(yesButton);
}
+
+ if( flags & Alert.NO )
+ {
+ noButton = new TextButton();
+ noButton.text = alertModel.noLabel;
+ noButton.addEventListener("click", handleNo);
+
+ controlBar.addElement(noButton);
+ }
}
/**
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
b/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
index f267c59..63121ba 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_alert.sass
@@ -30,13 +30,12 @@
max-width: 100%
max-height: 100%
border: 0px solid
-
- // box-shadow: 0px 6px 60px -10px rgba(112,112,112,0.7)
- // background-color: #FFFFFF
- // border-radius: 10px
+ border-radius: 3px
+ box-shadow: 0px 6px 60px -10px rgba(112,112,112,0.7)
+ background-color: #FFFFFF
.jewel.titlebar
- padding: 10px 10px 0px 10px
+ padding: 14px 14px 0px 14px
height: 50px
.jewel.label
@@ -49,41 +48,42 @@
min-width: 16px
min-height: 16px
padding: 4px
- background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 14 14'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-829,
-278)'><g fill='#777777' transform='translate(825, 274)'><path
d='M15.9921875,18 C15.8133104,18 11,13.05896 11,13.05896 C11,13.05896
6.20438984,18 6.0255127,18 C5.84663556,18 4,16.2295363 4,16.0506592
C4,15.871782 9.07348633,11 9.07348633,11 C9.07348633,11 4,6.21037128
4,6.03149414 C4,5.852617 5.84663556,4.05688477 6.0255127,4.056884 [...]
+ background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 14 14'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-829,
-278)'><g fill='#555555' transform='translate(825, 274)'><path
d='M15.9921875,18 C15.8133104,18 11,13.05896 11,13.05896 C11,13.05896
6.20438984,18 6.0255127,18 C5.84663556,18 4,16.2295363 4,16.0506592
C4,15.871782 9.07348633,11 9.07348633,11 C9.07348633,11 4,6.21037128
4,6.03149414 C4,5.852617 5.84663556,4.05688477 6.0255127,4.056884 [...]
background-repeat: no-repeat
- //background-size: 60%
- //background-position: center
background-attachment: fixed
-
+ box-shadow: none
+
+ &:hover
+ background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 14
14' version='1.1' xmlns='http://www.w3.org/2000/svg'><g
transform='translate(-829, -278)'><g fill='#777777' transform='translate(825,
274)'><path d='M15.9921875,18 C15.8133104,18 11,13.05896 11,13.05896
C11,13.05896 6.20438984,18 6.0255127,18 C5.84663556,18 4,16.2295363
4,16.0506592 C4,15.871782 9.07348633,11 9.07348633,11 C9.07348633,11
4,6.21037128 4,6.03149414 C4,5.852617 5.84663556,4.05688477 6.0255127,4.05 [...]
+
.Group
position: absolute
width: 100%
top: 50px
bottom: 50px
overflow-y: auto
- padding: 10px
+ padding: 14px
.jewel.label
font:
size: 1.1em
.jewel.controlbar
- padding: 0px 10px 10px 10px
+ padding: 0px 14px 14px 14px
position: absolute
+ right: 50%
bottom: 0
- width: 100%
height: 50px
- display: flex
- flex-direction: row-reverse
+
+ > *
+ margin-left: 6px
+ .backdrop
background-color: rgba(0, 0, 0, .5)
- // filter: blur(5px)
j|Alert
IBeadModel:
ClassReference("org.apache.royale.html.beads.models.AlertModel")
IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.AlertController")
- //IBeadLayout:
ClassReference("org.apache.royale.html.beads.layouts.VerticalFlexLayout")
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.AlertView")
@media -royale-swf
--
To stop receiving notification emails like this one, please contact
[email protected].
