From 5e15f6ccc692761ca6cc306c4dbb3b35c773658a Mon Sep 17 00:00:00 2001 From: Sebastien Hattry Date: Thu, 25 Nov 2021 17:26:33 +0100 Subject: [PATCH] fix header logo bug in responsive + add arrow in menu burger --- public/assets/images/arrow-burger.png | Bin 0 -> 1208 bytes public/css/app.css | 9 ++ resources/assets/images/arrow-burger.png | Bin 0 -> 1208 bytes resources/sass/_header.scss | 3 + resources/sass/_menu.scss | 184 ++++++++++++----------- 5 files changed, 107 insertions(+), 89 deletions(-) create mode 100644 public/assets/images/arrow-burger.png create mode 100644 resources/assets/images/arrow-burger.png diff --git a/public/assets/images/arrow-burger.png b/public/assets/images/arrow-burger.png new file mode 100644 index 0000000000000000000000000000000000000000..59839a9c529de9f5454e1a54aebd265a1ceadf15 GIT binary patch literal 1208 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eW!3HFke0{SLNJ*BsMwA5Srr5%(GQ`zk9!uLS~AsQn;zFfp39xYDT62(s|s5su(?)1Hb_`sNdc^+B->UA;;0DU00rm#qErQQJwx4O0|NsEb4$IH z#H7UJq$C{$BLgEteFGDHLla#C11n=oD-#n1C{O}gSCo=w73AUuwG7C!RmvzSDX`Ml zFE20GD>v55FG|-pw6wI;H!#vSGSUUA&@HaaD@m--%_~-hnc$LIoLrPyP?DLSrvNfB zF)6>a#8wIDREQsP3*g4)6+^=b7-ISri3R$GdIlgr!4&%X;#ZoR3s+rS5|oN?FIIz# zLn;eW^@CE2^Gl18fiah+46>@g%DE^tu_V7JBtJg~7K{NI`6c= zc`5nj#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>@ILEF4`N4Gm3P4V(-OU7an>4P6~g zUEC~<%*>t54UJ%WUGkGlb5rw5V0u#!dW~@E1to^u0-((O0Ou0fg*9>t z_gF=YkF0$7?lAlP#x3Fk@r_*{9Zg>*T|Ut9ggsE9l%?b90;lthH~2Ch$gYuEFe|0u z3ZsCq))$eEwGFf67FI~HH3<1POpy*zx>QVu0r8Bd5}IkGNbVZDP4d&wnhHJvWU zb94BP1bQ6mbU3PQ;Ka$L##pE&WY4{#LhxEb>#~(HDhrJkJbEe7$-iocl*d%%lUJEU z%aeVj9FD3wa7AtsUa^BIJF02fHE)MCOro>7LgqMYY_)PwPU91JZY03G;Gm}f1B(Ph XrEloFeJZKEpt8i%)z4*}Q$iB}>>-Yy literal 0 HcmV?d00001 diff --git a/public/css/app.css b/public/css/app.css index befdb69..041c1da 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -4677,6 +4677,9 @@ h3:not(.item__title, .product-card__title){ justify-content:flex-end; height:50px; } + .site-header .logotype img{ + width:100px; + } } .menu-overlay__checkbox{ display:none; @@ -4743,12 +4746,18 @@ h3:not(.item__title, .product-card__title){ display:none; } .menu__item{ + position:relative; padding:1em; border-bottom:solid 1px #0c1417; } .menu__item:last-child{ border-bottom-width:0; } + .menu__item::after{ + position:absolute; + content:url(/assets/images/arrow-burger.png?3e1f77d8c70eabbfa541980dd2c5968c); + right:40px; + } .menu .menu-overlay{ position:fixed; display:flex; diff --git a/resources/assets/images/arrow-burger.png b/resources/assets/images/arrow-burger.png new file mode 100644 index 0000000000000000000000000000000000000000..59839a9c529de9f5454e1a54aebd265a1ceadf15 GIT binary patch literal 1208 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eW!3HFke0{SLNJ*BsMwA5Srr5%(GQ`zk9!uLS~AsQn;zFfp39xYDT62(s|s5su(?)1Hb_`sNdc^+B->UA;;0DU00rm#qErQQJwx4O0|NsEb4$IH z#H7UJq$C{$BLgEteFGDHLla#C11n=oD-#n1C{O}gSCo=w73AUuwG7C!RmvzSDX`Ml zFE20GD>v55FG|-pw6wI;H!#vSGSUUA&@HaaD@m--%_~-hnc$LIoLrPyP?DLSrvNfB zF)6>a#8wIDREQsP3*g4)6+^=b7-ISri3R$GdIlgr!4&%X;#ZoR3s+rS5|oN?FIIz# zLn;eW^@CE2^Gl18fiah+46>@g%DE^tu_V7JBtJg~7K{NI`6c= zc`5nj#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>@ILEF4`N4Gm3P4V(-OU7an>4P6~g zUEC~<%*>t54UJ%WUGkGlb5rw5V0u#!dW~@E1to^u0-((O0Ou0fg*9>t z_gF=YkF0$7?lAlP#x3Fk@r_*{9Zg>*T|Ut9ggsE9l%?b90;lthH~2Ch$gYuEFe|0u z3ZsCq))$eEwGFf67FI~HH3<1POpy*zx>QVu0r8Bd5}IkGNbVZDP4d&wnhHJvWU zb94BP1bQ6mbU3PQ;Ka$L##pE&WY4{#LhxEb>#~(HDhrJkJbEe7$-iocl*d%%lUJEU z%aeVj9FD3wa7AtsUa^BIJF02fHE)MCOro>7LgqMYY_)PwPU91JZY03G;Gm}f1B(Ph XrEloFeJZKEpt8i%)z4*}Q$iB}>>-Yy literal 0 HcmV?d00001 diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss index 7165608..a35468c 100644 --- a/resources/sass/_header.scss +++ b/resources/sass/_header.scss @@ -100,5 +100,8 @@ justify-content: flex-end; height: 50px; } + .logotype img { + width: 100px; + } } } diff --git a/resources/sass/_menu.scss b/resources/sass/_menu.scss index 9fc9e7c..99f1193 100644 --- a/resources/sass/_menu.scss +++ b/resources/sass/_menu.scss @@ -1,64 +1,64 @@ .menu-overlay__checkbox { display: none; } - -@media screen and (min-width: 800px){ - .menu{ - width:40%; - margin-left:300px; - text-transform:uppercase; - &-overlay__btn{ +@media screen and (min-width: 800px) { + .menu { + width: 40%; + margin-left: 300px; + text-transform: uppercase; + + &-overlay__btn { display: none; } - .menu__list{ - display:flex; - justify-content:space-between; + .menu__list { + display: flex; + justify-content: space-between; } - a{ - display:inline-block; - color:$color-blue; - text-decoration:none; - &:hover{ - color:$color-second; + a { + display: inline-block; + color: $color-blue; + text-decoration: none; + &:hover { + color: $color-second; } - &.active{ - position:relative; - color:$color-second; + &.active { + position: relative; + color: $color-second; } - &.active:before{ - content:""; - position:absolute; - top:-60px; - left:0; - right:0; - width:75px; - height:4px; - margin-left:auto; - margin-right:auto; + &.active:before { + content: ""; + position: absolute; + top: -60px; + left: 0; + right: 0; + width: 75px; + height: 4px; + margin-left: auto; + margin-right: auto; background-color: $color-main; } } - .only-smrt{ - display:none; + .only-smrt { + display: none; } - } + } } - -@media screen and (max-width: 799px){ - .menu{ - order:2; - .only-smrt a{ - color:$color-second; +@media screen and (max-width: 799px) { + .menu { + order: 2; + + .only-smrt a { + color: $color-second; } label { display: flex; - align-items:flex-start; + align-items: flex-start; justify-content: center; position: fixed; width: 2.8em; @@ -66,108 +66,114 @@ z-index: 9999; } - &__list{ + &__list { display: none; } - &__item{ - padding:1em; - border-bottom:solid 1px $color-dark; - &:last-child{ - border-bottom-width:0; + &__item { + position: relative; + padding: 1em; + border-bottom: solid 1px $color-dark; + &:last-child { + border-bottom-width: 0; + } + &::after { + position: absolute; + content: url(~@/images/arrow-burger.png); + right: 40px; } } - .menu-overlay{ - position:fixed; - display:flex; - right:0; - z-index:100; + .menu-overlay { + position: fixed; + display: flex; + right: 0; + z-index: 100; &__icon { display: block; position: relative; width: 1.5em; - height: .1em; + height: 0.1em; background: $color-light; - transition: .4s; - + transition: 0.4s; + &:after, &:before { content: ""; display: block; position: absolute; width: 100%; - height: .1em; + height: 0.1em; background: $color-light; - border-radius:2em; - transition: .4s; + border-radius: 2em; + transition: 0.4s; } &:before { top: -10px; } - + &:after { top: 10px; } } - - &__btn{ + + &__btn { display: flex; - justify-content:center; - align-items:center; - top:0; - right:20px; + justify-content: center; + align-items: center; + top: 0; + right: 20px; justify-content: center; cursor: pointer; } - + &__checkbox { - &:checked~.menu-overlay__btn .menu-overlay__icon { + &:checked ~ .menu-overlay__btn .menu-overlay__icon { background: 0 0; } - - &:checked~.menu-overlay__btn .menu-overlay__icon::before { + + &:checked ~ .menu-overlay__btn .menu-overlay__icon::before { transform: rotate(45deg); } - - &:checked~.menu-overlay__btn .menu-overlay__icon::after { + + &:checked ~ .menu-overlay__btn .menu-overlay__icon::after { transform: rotate(-45deg); } - - &:checked~.menu-overlay__btn .menu-overlay__icon::after, - &:checked~.menu-overlay__btn .menu-overlay__icon::before { + + &:checked ~ .menu-overlay__btn .menu-overlay__icon::after, + &:checked ~ .menu-overlay__btn .menu-overlay__icon::before { top: 0; } - - &:checked~.menu__list { - display:flex; + + &:checked ~ .menu__list { + display: flex; flex-direction: column; - position:fixed; - top:50px; - left:0; - width:100%; - padding-top:1em; - padding-left:1em; - padding-right:1em; + position: fixed; + top: 50px; + left: 0; + width: 100%; + padding-top: 1em; + padding-left: 1em; + padding-right: 1em; text-transform: uppercase; - background-color:$color-light; + background-color: $color-light; transition-delay: 0s; - box-shadow: 0 2px 8px rgba($color-dark, .20); + box-shadow: 0 2px 8px rgba($color-dark, 0.2); } } } } } -.secondmenu{ - display:flex; - justify-content:flex-end; +.secondmenu { + display: flex; + justify-content: flex-end; } @media screen and (max-width: 799px) { - .secondmenu{ + .secondmenu { margin-right: 3em; } -} \ No newline at end of file +}