From fe7ae049a8245e36584b9a4ea65d5fd850f62d7c Mon Sep 17 00:00:00 2001 From: Orabi Date: Tue, 9 Jul 2024 09:10:28 +0200 Subject: [PATCH 01/10] DMD09LEAFL-27: More css for leaflet maps --- source/sass/31-molecules/map/_leaflet.scss | 49 ++++++++++++++++++---- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index fe3d81ddc..a8bbdfdee 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -9,7 +9,7 @@ line-height: 55px; border-bottom-left-radius: 0; border-bottom-right-radius: 0; - box-shadow: 0 8px 12px 0 rgba(0, 125, 179, .06); + box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4); } } @@ -17,8 +17,8 @@ a { @include theme('background-color', 'color-none', 'leaflet-map-open-fullscreen-icon-background-color'); - background-image:url('#{$styleguide-dir}/img/svg/fullscreen-enter.svg'); - background-position:10px 10px; + background-image: url('#{$styleguide-dir}/img/svg/fullscreen-enter.svg'); + background-position: 10px 10px; background-repeat: no-repeat; background-size: auto; } @@ -30,7 +30,7 @@ @include theme('background-color', 'color-none', 'leaflet-map-close-fullscreen-icon-background-color'); background-image: url('#{$styleguide-dir}/img/svg/fullscreen-exit.svg'); - background-position:10px 10px; + background-position: 10px 10px; background-repeat: no-repeat; } } @@ -42,7 +42,7 @@ @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); background-image: url('#{$styleguide-dir}/img/svg/target.svg'); - background-position:10px 10px; + background-position: 10px 10px; background-repeat: no-repeat; width: 50px; height: 50px; @@ -56,7 +56,7 @@ @include theme('background-color', 'color-none', 'leaflet-map-layers-icon-background-color'); background-image: url('#{$styleguide-dir}/img/svg/layers.svg'); - background-position:10px 10px; + background-position: 10px 10px; background-repeat: no-repeat; border: 0; background-size: auto; @@ -65,7 +65,7 @@ .leaflet-control-zoom { a { - box-shadow: 0 8px 12px 0 rgba(0, 125, 179, .06); + box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4); span { @include theme('color', 'color-zero', 'leaflet-map-zoom-icon-color'); @@ -105,4 +105,39 @@ border-style: solid; border-width: 1px; } + + .gent-leaflet-location-icon { + @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); + + border-radius: 30px; + box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4); + padding: 5px; + } + + .leaflet-popup-content-wrapper { + border-radius: 0 + } + + a.leaflet-popup-close-button { + top: 10px; + right: 10px; + } + + .marker-cluster { + span { + @include theme('color', 'color-none', 'leaflet-map-marker-cluster-text-color'); + + font-size: 15px; + font-weight: bold; + } + } + + .marker-cluster-small { + background-color: rgba(0, 91, 169, 0.3); + + div { + background-color: rgba(0, 91, 169, 0.8); + } + } + } From 02108bcb19cbae3baa7536614fe93801c3df96c7 Mon Sep 17 00:00:00 2001 From: Orabi Date: Wed, 10 Jul 2024 13:22:56 +0200 Subject: [PATCH 02/10] DMD09LEAFL-27:Use box shadow mixin and fix feedback --- source/sass/11-base/mixins/_mixins.scss | 4 ++++ source/sass/31-molecules/map/_leaflet.scss | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/source/sass/11-base/mixins/_mixins.scss b/source/sass/11-base/mixins/_mixins.scss index c3bd0beae..e8e67c3bd 100644 --- a/source/sass/11-base/mixins/_mixins.scss +++ b/source/sass/11-base/mixins/_mixins.scss @@ -6,3 +6,7 @@ width: 1px; word-wrap: normal; } + +@mixin map-button-box-shadow { + box-shadow: 0 3px 14px rgba(0, 0, 0, .4); +} diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index a8bbdfdee..2781c1563 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -4,12 +4,13 @@ border: 0; a { + @include map-button-box-shadow; + width: 50px; height: 50px; line-height: 55px; border-bottom-left-radius: 0; border-bottom-right-radius: 0; - box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4); } } @@ -65,7 +66,7 @@ .leaflet-control-zoom { a { - box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4); + @include map-button-box-shadow; span { @include theme('color', 'color-zero', 'leaflet-map-zoom-icon-color'); @@ -108,9 +109,9 @@ .gent-leaflet-location-icon { @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); + @include map-button-box-shadow; border-radius: 30px; - box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4); padding: 5px; } @@ -133,10 +134,10 @@ } .marker-cluster-small { - background-color: rgba(0, 91, 169, 0.3); + background-color: rgba(0, 91, 169, .3); div { - background-color: rgba(0, 91, 169, 0.8); + background-color: rgba(0, 91, 169, .8); } } From 292a9a038457eafdf30d2612f23d6aa828285115 Mon Sep 17 00:00:00 2001 From: Orabi Date: Fri, 12 Jul 2024 08:57:41 +0200 Subject: [PATCH 03/10] DMD09LEAFL-27 : Generic box-shadow mixin --- source/sass/11-base/mixins/_mixins.scss | 4 ++-- source/sass/31-molecules/map/_leaflet.scss | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/sass/11-base/mixins/_mixins.scss b/source/sass/11-base/mixins/_mixins.scss index e8e67c3bd..4b3aeddaa 100644 --- a/source/sass/11-base/mixins/_mixins.scss +++ b/source/sass/11-base/mixins/_mixins.scss @@ -7,6 +7,6 @@ word-wrap: normal; } -@mixin map-button-box-shadow { - box-shadow: 0 3px 14px rgba(0, 0, 0, .4); +@mixin box-shadow($horizontal,$vertical ,$blur, $rgba) { + box-shadow: $horizontal $vertical $blur $rgba; } diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index 2781c1563..13d7c52e4 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -4,7 +4,7 @@ border: 0; a { - @include map-button-box-shadow; + @include box-shadow(0 ,3px, 14px, rgba(0, 0, 0, .4)); width: 50px; height: 50px; @@ -66,7 +66,7 @@ .leaflet-control-zoom { a { - @include map-button-box-shadow; + @include box-shadow(0 ,3px, 14px, rgba(0, 0, 0, .4)); span { @include theme('color', 'color-zero', 'leaflet-map-zoom-icon-color'); @@ -109,7 +109,7 @@ .gent-leaflet-location-icon { @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); - @include map-button-box-shadow; + @include box-shadow(0 ,3px, 14px, rgba(0, 0, 0, .4)); border-radius: 30px; padding: 5px; From 0bd2ec706a77790c00e412e94d07031af1c52624 Mon Sep 17 00:00:00 2001 From: Orabi Date: Fri, 12 Jul 2024 08:58:58 +0200 Subject: [PATCH 04/10] DMD09LEAFL-27: Code style --- source/sass/11-base/mixins/_mixins.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/sass/11-base/mixins/_mixins.scss b/source/sass/11-base/mixins/_mixins.scss index 4b3aeddaa..7af4711f7 100644 --- a/source/sass/11-base/mixins/_mixins.scss +++ b/source/sass/11-base/mixins/_mixins.scss @@ -7,6 +7,6 @@ word-wrap: normal; } -@mixin box-shadow($horizontal,$vertical ,$blur, $rgba) { +@mixin box-shadow($horizontal, $vertical, $blur, $rgba) { box-shadow: $horizontal $vertical $blur $rgba; } From 0db57d269eb60900ee7aa76470cce0edc0bd3797 Mon Sep 17 00:00:00 2001 From: Orabi Date: Fri, 12 Jul 2024 09:45:33 +0200 Subject: [PATCH 05/10] DMD09LEAFL-27:Search icon and small changes --- source/sass/31-molecules/map/_leaflet.scss | 43 ++++++++++++++-------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index 13d7c52e4..1ea5aef06 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -4,11 +4,11 @@ border: 0; a { - @include box-shadow(0 ,3px, 14px, rgba(0, 0, 0, .4)); + @include box-shadow(0, 3px, 14px, rgba(0, 0, 0, .4)); - width: 50px; - height: 50px; - line-height: 55px; + width: 40px; + height: 40px; + line-height: 40px; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } @@ -19,9 +19,9 @@ @include theme('background-color', 'color-none', 'leaflet-map-open-fullscreen-icon-background-color'); background-image: url('#{$styleguide-dir}/img/svg/fullscreen-enter.svg'); - background-position: 10px 10px; + background-position: 8px 8px; background-repeat: no-repeat; - background-size: auto; + background-size: 25px 25px; } } @@ -31,8 +31,9 @@ @include theme('background-color', 'color-none', 'leaflet-map-close-fullscreen-icon-background-color'); background-image: url('#{$styleguide-dir}/img/svg/fullscreen-exit.svg'); - background-position: 10px 10px; + background-position: 8px 8px; background-repeat: no-repeat; + background-size: 25px 25px; } } } @@ -43,10 +44,11 @@ @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); background-image: url('#{$styleguide-dir}/img/svg/target.svg'); - background-position: 10px 10px; + background-position: 8px 8px; background-repeat: no-repeat; - width: 50px; - height: 50px; + background-size: 25px 25px; + width: 40px; + height: 40px; margin: 0; } } @@ -57,21 +59,21 @@ @include theme('background-color', 'color-none', 'leaflet-map-layers-icon-background-color'); background-image: url('#{$styleguide-dir}/img/svg/layers.svg'); - background-position: 10px 10px; + background-position: 8px 8px; background-repeat: no-repeat; border: 0; - background-size: auto; + background-size: 25px 25px; } } .leaflet-control-zoom { a { - @include box-shadow(0 ,3px, 14px, rgba(0, 0, 0, .4)); + @include box-shadow(0, 3px, 14px, rgba(0, 0, 0, .4)); span { @include theme('color', 'color-zero', 'leaflet-map-zoom-icon-color'); - font-size: 2rem; + font-size: 1.5rem; } &.leaflet-control-zoom-in { @@ -84,6 +86,14 @@ border: 0; border-radius: 0; } + + &:hover, &:focus { + @include theme('background-color', 'color-none', 'leaflet-map-button-hover-background-color'); + + background-image: none; + background-size: unset; + outline: none; + } } } @@ -99,9 +109,12 @@ @include theme('background-color', 'color-none', 'leaflet-map-search-box-background-color'); @include theme('border-color', 'color-zero', 'leaflet-map-search-box-border-color'); + background-image: url('#{$styleguide-dir}/img/iconfont/search.svg'); + background-size: 25px 25px; color: rgb(25, 25, 25); border-radius: 3px; outline-style: none; + height: 30px; transition: border-color .25s; border-style: solid; border-width: 1px; @@ -109,7 +122,7 @@ .gent-leaflet-location-icon { @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); - @include box-shadow(0 ,3px, 14px, rgba(0, 0, 0, .4)); + @include box-shadow(0, 3px, 14px, rgba(0, 0, 0, .4)); border-radius: 30px; padding: 5px; From dc3cf51f24997470bb81600ca7dfb8856dcccd7d Mon Sep 17 00:00:00 2001 From: Orabi Date: Thu, 18 Jul 2024 09:42:30 +0200 Subject: [PATCH 06/10] DMD09LEAFL-27: Fix code style and add more clusters --- source/sass/31-molecules/map/_leaflet.scss | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index 1ea5aef06..f542bfddf 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -4,7 +4,7 @@ border: 0; a { - @include box-shadow(0, 3px, 14px, rgba(0, 0, 0, .4)); + @include box-shadow(0, 3px, 14px, color('gray',-3)); width: 40px; height: 40px; @@ -68,7 +68,7 @@ .leaflet-control-zoom { a { - @include box-shadow(0, 3px, 14px, rgba(0, 0, 0, .4)); + @include box-shadow(0, 3px, 14px, color('gray',-3)); span { @include theme('color', 'color-zero', 'leaflet-map-zoom-icon-color'); @@ -122,7 +122,7 @@ .gent-leaflet-location-icon { @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); - @include box-shadow(0, 3px, 14px, rgba(0, 0, 0, .4)); + @include box-shadow(0, 3px, 14px, color('gray',-3)); border-radius: 30px; padding: 5px; @@ -146,11 +146,14 @@ } } - .marker-cluster-small { - background-color: rgba(0, 91, 169, .3); + .marker-cluster-small, + .marker-cluster-medium, + .marker-cluster-large { + @include theme('background-color', 'color-primary-light', 'leaflet-map-markercluster-background-shadow'); div { - background-color: rgba(0, 91, 169, .8); + @include theme('background-color','color-primary', 'leaflet-map-markercluster-background-color'); + } } From 9d92850d0c1be00dcf0411b69091c9042b9b74e6 Mon Sep 17 00:00:00 2001 From: Orabi <48244596+orabina@users.noreply.github.com> Date: Thu, 18 Jul 2024 13:41:08 +0200 Subject: [PATCH 07/10] Update source/sass/31-molecules/map/_leaflet.scss Co-authored-by: lennartvava --- source/sass/31-molecules/map/_leaflet.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index f542bfddf..7cf939be0 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -122,7 +122,7 @@ .gent-leaflet-location-icon { @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); - @include box-shadow(0, 3px, 14px, color('gray',-3)); + @include box-shadow(0, 3px, 14px, color('gray', -3)); border-radius: 30px; padding: 5px; From 170db2860e04d81e7684b37c212d3e4ead5eb4dc Mon Sep 17 00:00:00 2001 From: Orabi <48244596+orabina@users.noreply.github.com> Date: Thu, 18 Jul 2024 13:41:12 +0200 Subject: [PATCH 08/10] Update source/sass/31-molecules/map/_leaflet.scss Co-authored-by: lennartvava --- source/sass/31-molecules/map/_leaflet.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index 7cf939be0..060aad2e2 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -68,7 +68,7 @@ .leaflet-control-zoom { a { - @include box-shadow(0, 3px, 14px, color('gray',-3)); + @include box-shadow(0, 3px, 14px, color('gray', -3)); span { @include theme('color', 'color-zero', 'leaflet-map-zoom-icon-color'); From faa9910fb1620dd573127eacf70c9e03d8394eca Mon Sep 17 00:00:00 2001 From: Orabi <48244596+orabina@users.noreply.github.com> Date: Thu, 18 Jul 2024 13:41:17 +0200 Subject: [PATCH 09/10] Update source/sass/31-molecules/map/_leaflet.scss Co-authored-by: lennartvava --- source/sass/31-molecules/map/_leaflet.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index 060aad2e2..95320a749 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -4,7 +4,7 @@ border: 0; a { - @include box-shadow(0, 3px, 14px, color('gray',-3)); + @include box-shadow(0, 3px, 14px, color('gray', -3)); width: 40px; height: 40px; From f7c69a39daa02b04164efcfd87ac5c82640a523a Mon Sep 17 00:00:00 2001 From: Orabi Date: Thu, 18 Jul 2024 13:51:30 +0200 Subject: [PATCH 10/10] DMD09LEAFL-27: Add default values --- source/sass/11-base/mixins/_mixins.scss | 2 +- source/sass/31-molecules/map/_leaflet.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/sass/11-base/mixins/_mixins.scss b/source/sass/11-base/mixins/_mixins.scss index 7af4711f7..e64b7708c 100644 --- a/source/sass/11-base/mixins/_mixins.scss +++ b/source/sass/11-base/mixins/_mixins.scss @@ -7,6 +7,6 @@ word-wrap: normal; } -@mixin box-shadow($horizontal, $vertical, $blur, $rgba) { +@mixin box-shadow($horizontal: 0, $vertical: 3px, $blur: 14px, $rgba: color('gray', -3)) { box-shadow: $horizontal $vertical $blur $rgba; } diff --git a/source/sass/31-molecules/map/_leaflet.scss b/source/sass/31-molecules/map/_leaflet.scss index 95320a749..c26339599 100644 --- a/source/sass/31-molecules/map/_leaflet.scss +++ b/source/sass/31-molecules/map/_leaflet.scss @@ -4,7 +4,7 @@ border: 0; a { - @include box-shadow(0, 3px, 14px, color('gray', -3)); + @include box-shadow(); width: 40px; height: 40px; @@ -68,7 +68,7 @@ .leaflet-control-zoom { a { - @include box-shadow(0, 3px, 14px, color('gray', -3)); + @include box-shadow(); span { @include theme('color', 'color-zero', 'leaflet-map-zoom-icon-color'); @@ -122,7 +122,7 @@ .gent-leaflet-location-icon { @include theme('background-color', 'color-none', 'leaflet-map-location-icon-background-color'); - @include box-shadow(0, 3px, 14px, color('gray', -3)); + @include box-shadow(); border-radius: 30px; padding: 5px;