Merge branch 'develop' into feature/ddw-614-add-display-of-current-rewards-balance

Author: DominikGuzei

CHANGELOG.md

@@ -12,6 +12,7 @@
 ### Fixes
 
 - Fixed main container zIndex ([PR 2863](https://github.com/input-output-hk/daedalus/pull/2863))
+- Fixed ui overlap issues ([PR 2881](https://github.com/input-output-hk/daedalus/pull/2881))
 
 ## 4.9.0-FC1
 

source/renderer/app/components/appUpdate/AppUpdateOverlay.scss

@@ -1,5 +1,6 @@
 @import '../../themes/mixins/link';
 @import '../../themes/mixins/overlay-backdrop';
+@import '../../themes/mixins/layers.scss';
 
 .component {
   align-items: center;
@@ -14,7 +15,7 @@
   position: fixed;
   top: 0;
   width: 100vw;
-  z-index: 22;
+  z-index: $dialog-z-index;
   @include overlay-backrop;
 
   .content {

source/renderer/app/components/knownIssues/RTSFlagsRecommendationOverlay/RTSFlagsRecommendationOverlay.scss

@@ -1,4 +1,5 @@
 @import '../../../themes/mixins/overlay-backdrop';
+@import '../../../themes/mixins/layers.scss';
 
 // TODO reduce duplication with AlertsOverlay
 // https://input-output.atlassian.net/browse/DDW-928
@@ -15,7 +16,7 @@
   position: fixed;
   top: 0;
   width: 100vw;
-  z-index: 22;
+  z-index: $dialog-z-index;
   @include overlay-backrop;
 
   .actionBtn {

source/renderer/app/components/news/AlertsOverlay.scss

@@ -1,4 +1,5 @@
 @import '../../themes/mixins/overlay-backdrop';
+@import '../../themes/mixins/layers.scss';
 
 .component {
   align-items: center;
@@ -12,7 +13,7 @@
   position: fixed;
   top: 0;
   width: 100vw;
-  z-index: 22;
+  z-index: $dialog-z-index;
   @include overlay-backrop;
 
   .actionBtn {

source/renderer/app/components/news/IncidentOverlay.scss

@@ -1,4 +1,5 @@
 @import '../../themes/mixins/overlay-backdrop';
+@import '../../themes/mixins/layers.scss';
 
 .component {
   align-items: center;
@@ -12,7 +13,7 @@
   position: fixed;
   top: 0;
   width: 100vw;
-  z-index: 22;
+  z-index: $dialog-z-index;
   @include overlay-backrop;
 
   .actionBtn {

source/renderer/app/components/news/NewsFeed.scss

@@ -1,3 +1,5 @@
+@import '../../themes/mixins/layers.scss';
+
 .component {
   background: var(--theme-news-feed-background-color);
   box-shadow: var(--theme-news-feed-box-shadow-color);
@@ -11,7 +13,7 @@
   top: 0;
   transition: margin-right 400ms ease;
   width: 460px;
-  z-index: 20;
+  z-index: $dialog-z-index;
 
   &.noTransition {
     transition: none;

source/renderer/app/themes/mixins/layers.scss

@@ -0,0 +1 @@
+$dialog-z-index: 200;