Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
Resin
Client
Commits
cc3c16c3
Commit
cc3c16c3
authored
3 years ago
by
Hugo SUBTIL
Browse files
Options
Downloads
Patches
Plain Diff
feat(carto): put selected and hover marker on top of the others
parent
5cd7490c
No related branches found
No related tags found
2 merge requests
!220
1.14
,
!200
feat/US28 put selected marker on top of the others
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/map/components/map.component.scss
+6
-0
6 additions, 0 deletions
src/app/map/components/map.component.scss
src/app/map/services/marker.ts
+2
-2
2 additions, 2 deletions
src/app/map/services/marker.ts
src/assets/scss/_z-index.scss
+1
-0
1 addition, 0 deletions
src/assets/scss/_z-index.scss
with
9 additions
and
2 deletions
src/app/map/components/map.component.scss
+
6
−
0
View file @
cc3c16c3
...
...
@@ -5,6 +5,7 @@
@import
'../../../assets/scss/shapes'
;
@import
'../../../assets/scss/buttons'
;
@import
'../../../assets/scss/breakpoint'
;
@import
'../../../assets/scss/z-index'
;
.map-wrapper
{
border-radius
:
6px
;
...
...
@@ -86,6 +87,7 @@
}
}
&
:hover
{
z-index
:
calc
(
$map-selected-marker
-
1
)
!
important
;
svg
{
fill
:
$blue-hover
;
&
.mdm
{
...
...
@@ -160,3 +162,7 @@
.body-wrap
{
height
:
400px
;
}
::ng-deep
.on-top-marker
{
z-index
:
$map-selected-marker
!
important
;
}
This diff is collapsed.
Click to expand it.
src/app/map/services/marker.ts
+
2
−
2
View file @
cc3c16c3
...
...
@@ -8,14 +8,14 @@ export const markerIcon = divIcon({
popupAnchor
:
[
0
,
-
48
],
});
export
const
markerIconActive
=
divIcon
({
className
:
null
,
className
:
'
on-top-marker
'
,
html
:
'
<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#map-markerSelected"></use></svg>
'
,
iconSize
:
[
48
,
48
],
iconAnchor
:
[
24
,
48
],
popupAnchor
:
[
0
,
-
48
],
});
export
const
markerIconHover
=
divIcon
({
className
:
null
,
className
:
'
on-top-marker
'
,
html
:
'
<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#map-markerHover"></use></svg>
'
,
iconSize
:
[
48
,
48
],
iconAnchor
:
[
24
,
48
],
...
...
This diff is collapsed.
Click to expand it.
src/assets/scss/_z-index.scss
+
1
−
0
View file @
cc3c16c3
$map-selected-marker
:
600
;
// Phone view
$btn-phone-switch-map-list-z-index
:
1002
;
$menu-phone-z-index
:
1003
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment