diff --git a/frontend/src/components/map/map_comp/components/selectButton.vue b/frontend/src/components/map/map_comp/components/selectButton.vue index a59aa94ed1a8d54a89dd521c988c193cbc5ed3d6..b2bf09720a69b87dd18045fa44ed0593c9bd7187 100644 --- a/frontend/src/components/map/map_comp/components/selectButton.vue +++ b/frontend/src/components/map/map_comp/components/selectButton.vue @@ -17,14 +17,16 @@ border-radius: 0.5rem; padding: 0.7em 1.5em; cursor: pointer; - box-shadow: 0 2px 8px rgba(39, 174, 96, 0.15); + box-shadow: 0 .2rem .8rem rgba(39, 174, 96, 0.15); transition: background 0.2s, box-shadow 0.2s, transform 0.1s; outline: none; + &:hover, &:focus { background: linear-gradient(90deg, #219150 0%, #27ae60 100%); - box-shadow: 0 4px 16px rgba(39, 174, 96, 0.25); + box-shadow: 0 .4rem 1.6rem rgba(39, 174, 96, 0.25); } + &:active { background: #219150; } diff --git a/frontend/src/components/map/map_comp/map.vue b/frontend/src/components/map/map_comp/map.vue index 6fcb049b2cd302eb1c755efecc8959437183795c..058c90df378158b6f2070fab358c678a771d381c 100644 --- a/frontend/src/components/map/map_comp/map.vue +++ b/frontend/src/components/map/map_comp/map.vue @@ -279,7 +279,7 @@ const selectPoint = (marker: DeliveryMarker) => { @include font(1.2rem, 600, 1.2); @include margin(0 0 0.8rem); @include color(#333); - border-bottom: 1px solid #e0e0e0; + border-bottom: .1rem solid #e0e0e0; @include padding(0 0 0.5rem); @include dark { @@ -289,7 +289,7 @@ const selectPoint = (marker: DeliveryMarker) => { } .popup-info { - margin-bottom: 10px; + margin-bottom: 1rem; @include display(flex) { flex-direction: column; gap: 0.5rem; @@ -319,7 +319,7 @@ const selectPoint = (marker: DeliveryMarker) => { .popup-item strong { display: flex; align-items: center; - gap: 4px; + gap: .4rem; .icon { width: 1.3rem; diff --git a/frontend/src/components/map/mapper.vue b/frontend/src/components/map/mapper.vue index 1a33e6e4c3c1c702ef4d76c1568bf3565aad41d2..24e5997228dc1315d7f063277a4263e2f2740e41 100644 --- a/frontend/src/components/map/mapper.vue +++ b/frontend/src/components/map/mapper.vue @@ -85,17 +85,17 @@ watch(receivedParams, async params => { } @include padding(1rem); - border-radius: 8px; + border-radius: .8rem; max-height: 100vh; - @include boxsh(1px 2px 12px 9px rgba(34, 60, 80, 0.2)); - margin-bottom: 20px; + @include boxsh(.1rem .2rem 1.2rem .9rem rgba(34, 60, 80, 0.2)); + margin-bottom: 2rem; @include dark { background-color: $black; color: $white; @include boxsh(none); - margin-bottom: 0px; + margin-bottom: 0; } @include desktop { diff --git a/frontend/src/scss/reset/_mixins.scss b/frontend/src/scss/reset/_mixins.scss index c56417f8398cb4a9448a4963c4126670e5b8cc5c..9a4e9bf6d6e1f3efac3327fc16270b5231b933ab 100644 --- a/frontend/src/scss/reset/_mixins.scss +++ b/frontend/src/scss/reset/_mixins.scss @@ -152,13 +152,13 @@ } @mixin mobile { - @media (width <= 600px) { + @media (max-width: 600px) { @content; } } @mixin desktop { - @media (width >= 601px) { + @media (min-width: 601px) { @content; } }