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 5522af4 jewel z-index levels
5522af4 is described below
commit 5522af4e762c8555f62187707e91326fcf192b44
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Mar 17 13:10:10 2019 +0100
jewel z-index levels
---
.../projects/Jewel/src/main/resources/defaults.css | 16 ++++++++--------
frameworks/projects/Jewel/src/main/sass/_variables.sass | 7 +++++++
.../Jewel/src/main/sass/components/_combobox.sass | 2 +-
.../Jewel/src/main/sass/components/_datefield.sass | 2 +-
.../projects/Jewel/src/main/sass/components/_drawer.sass | 2 +-
.../Jewel/src/main/sass/components/_footerbar.sass | 2 +-
.../projects/Jewel/src/main/sass/components/_popup.sass | 2 +-
.../Jewel/src/main/sass/components/_snackbar.sass | 2 +-
.../Jewel/src/main/sass/components/_tooltip.sass | 2 +-
.../Jewel/src/main/sass/components/_topappbar.sass | 2 +-
10 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 05c730d..e991d44 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -372,7 +372,7 @@ j|ComboBox {
height: 100%;
overflow: hidden;
contain: strict;
- z-index: 5;
+ z-index: 60;
color: rgba(0, 0, 0, 0.8);
}
.combobox-popup::before {
@@ -522,7 +522,7 @@ j|DateChooser {
height: 100%;
overflow: hidden;
contain: strict;
- z-index: 5;
+ z-index: 60;
color: rgba(0, 0, 0, 0.8);
}
.datechooser-popup::before {
@@ -622,7 +622,7 @@ j|Divider {
height: 100%;
overflow: hidden;
contain: strict;
- z-index: 15;
+ z-index: 100;
}
.jewel.drawer.float::before {
position: absolute;
@@ -756,7 +756,7 @@ j|DropDownList {
flex-direction: column;
justify-content: space-between;
width: 100%;
- z-index: 4;
+ z-index: 20;
position: fixed;
bottom: 0px;
}
@@ -3193,7 +3193,7 @@ j|Spinner {
height: 100%;
overflow: hidden;
contain: strict;
- z-index: 5;
+ z-index: 40;
}
.popup-content::before {
position: absolute;
@@ -3438,7 +3438,7 @@ j|Slider {
bottom: 0;
position: fixed;
width: 100%;
- z-index: 5;
+ z-index: 40;
justify-content: center;
}
@@ -3769,7 +3769,7 @@ j|TitleBar {
padding: 6px;
position: absolute;
pointer-events: none;
- z-index: 5;
+ z-index: 80;
}
.jewel.tooltip.error {
margin-top: -31px !important;
@@ -3791,7 +3791,7 @@ j|TitleBar {
flex-direction: column;
justify-content: space-between;
width: 100%;
- z-index: 4;
+ z-index: 20;
position: fixed;
}
.jewel.topappbar .topBarAppHeader.fixed {
diff --git a/frameworks/projects/Jewel/src/main/sass/_variables.sass
b/frameworks/projects/Jewel/src/main/sass/_variables.sass
index e3b8259..0ca169c 100644
--- a/frameworks/projects/Jewel/src/main/sass/_variables.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_variables.sass
@@ -17,6 +17,13 @@
//
////////////////////////////////////////////////////////////////////////////////
+// Z-INDEX LEVELS
+$app-navigation-zindex: 100 // drawer is on top of all
+$app-tooltips-zindex: 80 // next level for tooltips
+$app-control-popups-zindex: 60 // popups from controls: combobox, datefield,...
+$app-popups-zindex: 40 // popups (but alert is a dialog and is
on top of all)
+$app-bars-zindex: 20 // topappbar, footerappbar
+
// DEVICE DIMENSIONS
$phone: 0px
$tablet: 768px
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
index 5027625..eaa8653 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
@@ -78,7 +78,7 @@ $combobox-item-min-heigh: 34px
overflow: hidden
contain: strict
- z-index: 5
+ z-index: $app-control-popups-zindex
color: rgba(0, 0, 0, 0.8)
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass
b/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass
index 194f2d2..6f67596 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass
@@ -67,7 +67,7 @@ $datechooser-item-min-heigh: 34px
overflow: hidden
contain: strict
- z-index: 5
+ z-index: $app-control-popups-zindex
color: rgba(0, 0, 0, 0.8)
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass
b/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass
index 55df95d..985108c 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass
@@ -38,7 +38,7 @@ $drawer-float-max-width: 310px
overflow: hidden
contain: strict
- z-index: 15
+ z-index: $app-navigation-zindex
&::before
position: absolute
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_footerbar.sass
b/frameworks/projects/Jewel/src/main/sass/components/_footerbar.sass
index d6045ab..4776acc 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_footerbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_footerbar.sass
@@ -32,7 +32,7 @@ $footer-bar-button-size: 48px
flex-direction: column
justify-content: space-between
width: 100%
- z-index: 4
+ z-index: $app-bars-zindex
position: fixed
bottom: 0px
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_popup.sass
b/frameworks/projects/Jewel/src/main/sass/components/_popup.sass
index 3024bd8..a415729 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_popup.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_popup.sass
@@ -38,7 +38,7 @@ $popup-content-margin-offset: 10px
overflow: hidden
contain: strict
- z-index: 5
+ z-index: $app-popups-zindex
&::before
position: absolute
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_snackbar.sass
b/frameworks/projects/Jewel/src/main/sass/components/_snackbar.sass
index 90bbb24..67d76a6 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_snackbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_snackbar.sass
@@ -26,7 +26,7 @@
bottom: 0
position: fixed
width: 100%
- z-index: 5
+ z-index: $app-popups-zindex
justify-content: center
&.open
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_tooltip.sass
b/frameworks/projects/Jewel/src/main/sass/components/_tooltip.sass
index f87cf92..e2bb40b 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_tooltip.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_tooltip.sass
@@ -25,7 +25,7 @@
padding: 6px
position: absolute
pointer-events: none
- z-index: 5
+ z-index: $app-tooltips-zindex
&.error
margin-top: -31px !important
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass
b/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass
index c2037d1..0f47736 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass
@@ -32,7 +32,7 @@ $top-app-bar-button-size: 48px
flex-direction: column
justify-content: space-between
width: 100%
- z-index: 4
+ z-index: $app-bars-zindex
position: fixed
&.fixed
