Skip to content

Commit

Permalink
Merge pull request #83 from gisktzh/bugfix/gb3-1730-safari-and-ios-is…
Browse files Browse the repository at this point in the history
…sues

GB3-1730: iOS and Safari Issues
  • Loading branch information
TIL-EBP authored Dec 17, 2024
2 parents 656c208 + 22f86ee commit 7a255cd
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
11 changes: 10 additions & 1 deletion src/app/map/map-page.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
@include mixins.tool-button-mobile;
@include mixins.map-element-box-shadow;
}

/*
* We are setting the z-index for all direct children to 1 to ensure that the elements are above the map. The map itself has a z-index of 0.
* This is a workaround to ensure that the TAB order works as expected so that the elements within the map container are last in the TAB order.
*/
.map-container .mat-drawer-content > * {
z-index: z-index-variables.$map-ui-element;
}
}

.map-container {
Expand Down Expand Up @@ -55,6 +63,7 @@
top: 0;
left: 0;
height: 100%;
z-index: z-index-variables.$map-overlay;

&--right {
left: unset;
Expand Down Expand Up @@ -188,8 +197,8 @@
}

.map-container__map {
z-index: z-index-variables.$map-container;
position: relative;
z-index: z-index-variables.$map-container;
}
}

Expand Down
19 changes: 10 additions & 9 deletions src/styles/variables/_z-index-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
========================== */
$navbar: 400; // should always stay on top, only adjust if you know what you're doing
$map-overlay: 100;
$map-attribute-filter: 2;
$basemap-selector: 2;
$active-map-item-connection-line: 1;
$feature-info-content-table-header: 1;
$search-window-results: 3;
$cdk-drag-handle: 1;
$collapsing-flexbox-list-item-hover: 1;
$data-download-order-queue: 1;
$search-window-results: 4;
$map-attribute-filter: 3;
$basemap-selector: 3;
$active-map-item-connection-line: 2;
$feature-info-content-table-header: 2;
$cdk-drag-handle: 2;
$collapsing-flexbox-list-item-hover: 2;
$data-download-order-queue: 2;
$map-ui-element: 1;
$scrollbar-width-calculation-container: 0;
$map-container: -1; // should always stay at the bottom (lower than 0), only adjust if you know what you're doing
$map-container: 0;

0 comments on commit 7a255cd

Please sign in to comment.