From 3399b27577d5ec125026454afe8759ba49f516ae Mon Sep 17 00:00:00 2001 From: xem Date: Mon, 24 Jun 2019 16:35:03 +0200 Subject: [PATCH 1/2] QMAPS-864 CSS fixes on PJ POI panel --- src/scss/includes/panels/poi_panel.scss | 37 +++++++++++++------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/scss/includes/panels/poi_panel.scss b/src/scss/includes/panels/poi_panel.scss index 5e37278c3..30c8b784b 100644 --- a/src/scss/includes/panels/poi_panel.scss +++ b/src/scss/includes/panels/poi_panel.scss @@ -130,7 +130,7 @@ $HEADER_SIZE: 40px; .poi_panel__back_to_list .poi_panel__back_to_list_logo { margin-left: 8px; - vertical-align: middle; + vertical-align: text-bottom; } .poi_panel__back_to_list:hover { @@ -326,25 +326,14 @@ $HEADER_SIZE: 40px; float: left; text-decoration: none; text-align: center; - min-width: 45px; - - &:not(:last-child){ - margin-right: 15px; - max-width: calc(23% - 20px); - } - - &.poi_panel__actions__phone_container { - max-width: 28%; - } - - &:not(:first-child){ - min-width: 20% - } + min-width: 24%; + max-width: 24%; + width: 24%; &:hover { text-decoration: none; } - +l button { width: 100%; display: block; @@ -376,6 +365,7 @@ $HEADER_SIZE: 40px; height: 25px; font-size: 12px; color: $secondary_text; + margin-top: 7px; } .poi_panel__actions__text:hover { @@ -615,10 +605,10 @@ $HEADER_SIZE: 40px; } .poi_panel__header { - font-size: 13px; + font-size: 12px; color: $secondary_text; text-transform: uppercase; - height: $HEADER_SIZE; + height: 40px; background: $background; z-index: 1; box-shadow: rgba(0, 0, 0, 0.16) 1px 1px 6px; @@ -640,6 +630,17 @@ $HEADER_SIZE: 40px; } } +@media (max-width: 490px) { + .poi_panel__container { + padding: 5px 15px 0; + } + + .poi_panel__actions { + width: 110%; + margin-left: -5%; + } +} + @media (max-width: 640px) { .poi_panel { width: 100vw; From 563bc303a5b7a63dbf971d588f9dc26cfec0a62d Mon Sep 17 00:00:00 2001 From: Adrien Matissart Date: Tue, 9 Jul 2019 18:05:39 +0200 Subject: [PATCH 2/2] Fixes after rebase --- src/scss/includes/panels/poi_panel.scss | 47 ++++++++++++++----------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/src/scss/includes/panels/poi_panel.scss b/src/scss/includes/panels/poi_panel.scss index 30c8b784b..dacee8f26 100644 --- a/src/scss/includes/panels/poi_panel.scss +++ b/src/scss/includes/panels/poi_panel.scss @@ -128,11 +128,6 @@ $HEADER_SIZE: 40px; max-height: calc(100vh - 120px - #{$HEADER_SIZE}); } -.poi_panel__back_to_list .poi_panel__back_to_list_logo { - margin-left: 8px; - vertical-align: text-bottom; -} - .poi_panel__back_to_list:hover { color: $secondary_text; } @@ -326,14 +321,26 @@ $HEADER_SIZE: 40px; float: left; text-decoration: none; text-align: center; - min-width: 24%; - max-width: 24%; - width: 24%; + min-width: 45px; + + &:not(:last-child){ + margin-right: 15px; + max-width: calc(23% - 20px); + } + + &.poi_panel__actions__phone_container { + max-width: 28%; + } + + &:not(:first-child){ + min-width: 20% + } + &:hover { text-decoration: none; } -l + button { width: 100%; display: block; @@ -597,6 +604,11 @@ l line-height: $HEADER_SIZE; padding-left: 8px; cursor: pointer; + + .poi_panel__back_to_list_logo { + margin-left: 8px; + vertical-align: text-bottom; + } } @media (min-width: 641px) { @@ -608,7 +620,7 @@ l font-size: 12px; color: $secondary_text; text-transform: uppercase; - height: 40px; + height: $HEADER_SIZE; background: $background; z-index: 1; box-shadow: rgba(0, 0, 0, 0.16) 1px 1px 6px; @@ -630,17 +642,6 @@ l } } -@media (max-width: 490px) { - .poi_panel__container { - padding: 5px 15px 0; - } - - .poi_panel__actions { - width: 110%; - margin-left: -5%; - } -} - @media (max-width: 640px) { .poi_panel { width: 100vw; @@ -786,4 +787,8 @@ l border-color: $primary_text; color: #fff; } + + .poi_panel__container { + padding: 0 15px; + } }