Skip to content

Commit

Permalink
add burger menu
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlbShar
AlbShar committed Jul 28, 2022
2 parents f5bacb7 + cc7288a commit 824262c
Show file tree
Hide file tree
Showing 54 changed files with 635 additions and 373 deletions.
5 changes: 5 additions & 0 deletions blocks/common.blocks/actions/__cart-content/actions__cart-content.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.actions {
&__cart-content {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/actions/__cart-quantity/actions__cart-quantity.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.actions {
&__cart-quantity {
display: none;
}
}
2 changes: 1 addition & 1 deletion ...ons/__basket-svg/actions__basket-svg.scss → ...actions/__cart-svg/actions__cart-svg.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.actions {
&__basket-svg {
&__cart-svg {
margin: 0 12px 0 13px;
}
}
2 changes: 1 addition & 1 deletion ...s/__basket-text/actions__basket-text.scss → ...tions/__cart-text/actions__cart-text.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.actions {
&__basket-text {
&__cart-text {
font: 400 1rem var(--font-family);
color: var(--color-text-title);
margin-left: 10px;
Expand Down
2 changes: 1 addition & 1 deletion ...cks/actions/__basket/actions__basket.scss → ....blocks/actions/__cart/actions__cart.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.actions {
&__basket {
&__cart {
filter: var(--filter);

@media screen and (min-width: 1123.8px) {
Expand Down
2 changes: 1 addition & 1 deletion blocks/common.blocks/actions/__list-item/actions__list-item.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
&__list-item {
@media screen and (max-width: 459.8px) {
margin: 0 auto ;
padding: 15px 15px 15px 25%;
padding: 15px 25%;
width: 100vw;
display: flex;
justify-content: flex-start;
Expand Down
3 changes: 2 additions & 1 deletion blocks/common.blocks/actions/__list/actions__list.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
max-width: 328px;
margin: 0;
list-style-type: none;
padding: 15px 0 0 0;


@media screen and (max-width: 459.8px) {
flex-direction: column;
justify-content: center;
max-width: 100%;
padding: 15px 0 0 0;
}
}
}
9 changes: 5 additions & 4 deletions blocks/common.blocks/actions/actions.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
max-height: calc(100% - 62px);
transform: translateX(150%);
transition: transform 0.9s ease-in-out;

}


Expand All @@ -31,7 +30,9 @@
@import "./__signup-link/actions__signup-link.scss";
@import "__sign-in/actions__sign-in.scss";
@import "__sign-in-text/actions__sign-in-text.scss";
@import "./__basket/actions__basket.scss";
@import "./__basket-text/actions__basket-text.scss";
@import "./__cart/actions__cart.scss";
@import "./__cart-text/actions__cart-text.scss";
@import "./_visible/actions_visible.scss";
@import "./__basket-svg/actions__basket-svg.scss";
@import "./__cart-svg/actions__cart-svg.scss";
@import "./__cart-quantity/actions__cart-quantity.scss";
@import "./__cart-content/actions__cart-content.scss";
2 changes: 1 addition & 1 deletion blocks/common.blocks/burger/burger.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function toggleBurger() {
nav.classList.toggle('actions_visible');

basketText.innerHTML = "Корзина";
basketText.className = 'actions__basket-text';
basketText.className = 'actions__cart-text';
basketWrapper.append(basketText);

switchText.innerHTML = "Сменить тему";
Expand Down
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-content/__bottom/cart-content__bottom.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-content {
&__bottom {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-content/__btn/cart-content__btn.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-content {
&__btn {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-content/__fullprace/cart-content__fullprace.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-content {
&__fullprace {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-content/__item/cart-content__item.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-content {
&__item {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-content/__list/cart-content__list.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-content {
&__list {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-content/__product/cart-content__product.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-content {
&__product {

}
}
9 changes: 9 additions & 0 deletions blocks/common.blocks/cart-content/cart-content.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.cart-content {
display: none;
}
@import "./__bottom/cart-content__bottom.scss";
@import "./__btn/cart-content__btn.scss";
@import "./__fullprace/cart-content__fullprace.scss";
@import "./__item/cart-content__item.scss";
@import "./__list/cart-content__list.scss";
@import "./__product/cart-content__product.scss";
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-product/__delete/cart-product__delete.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-product {
&__delete {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-product/__png/cart-product__png.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-product {
&__png {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-product/__price/cart-product__price.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-product {
&__price {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-product/__text/cart-product__text.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-product {
&__text {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-product/__title/cart-product__title.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-product {
&__title {

}
}
5 changes: 5 additions & 0 deletions blocks/common.blocks/cart-product/__wrapper/cart-product__wrapper.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cart-product {
&__wrapper {

}
}
6 changes: 6 additions & 0 deletions blocks/common.blocks/cart-product/cart-product.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import "./__delete/cart-product__delete.scss";
@import "./__png/cart-product__png.scss";
@import "./__price/cart-product__price.scss";
@import "./__text/cart-product__text.scss";
@import "./__title/cart-product__title.scss";
@import "./__wrapper/cart-product__wrapper.scss";
3 changes: 1 addition & 2 deletions blocks/common.blocks/form/__registr/form__registr.scss
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
.form {
&__registr{
@include font($font-family, 500, 0.9rem, $color_white);
font: 500 0.9rem var(--font-family);
color: var(--color-textBtn);
box-sizing: border-box;
background-color: var(--color-bgGoogle);
background-color: #b72e30;
padding: 10px 10px;
border: none;
border-radius: 5px;
Expand Down
4 changes: 2 additions & 2 deletions blocks/common.blocks/form/__submit/form__submit.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
&__submit{
position: relative;
font: 400 0.9rem var(--font-family);
color: var(--color-textBtn);
color: #fff;
display: block;
box-sizing: border-box;
background-color: var(--color-btnSubmit);
background-color: #2f7007;
padding: 10px 0;
width: 100%;
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions blocks/common.blocks/form/__text/form__text.scss
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.form {
&__text > a{
font: 400 0.9rem var(--color-text-title);
font: 400 0.9rem var(--font-family);
text-decoration: none;
color: var(--color-textForgetPsd);
}
&__text {
font: 400 0.9rem var(--color-text-title);
font: 400 0.9rem var(--font-family);
color: var(--color-text-title);
}
}
5 changes: 1 addition & 4 deletions blocks/common.blocks/list/__item/list__item.scss
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
.list {
&__item {
margin-bottom: 24px;
margin-top: -5px;
margin-left: -5px;
list-style-type: none;

@media screen and (min-width: 767.8px) {
margin-top: 15px;
}

}
}
1 change: 1 addition & 0 deletions blocks/common.blocks/list/list.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
padding: 0;
flex-wrap: wrap;
width: 90%;
padding-top: 40px;

@media screen and (max-width: 766.8px) {
flex-wrap: wrap;
Expand Down
9 changes: 4 additions & 5 deletions blocks/common.blocks/root/root.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ body {
--color-btnClose: #1D1D1D;
--color-formFooter: rgba(128, 128, 128, 0.5);
--color-msgBg: rgba(128,128,128,0.2);
--color-bgGoogle: #dd4b39;
--color-bgTwitter: #55acee;
--color-bgVK: #3b5998;
--color-focus: #00A3D9;
--color-btnSubmit: #59bd5a;
--color-shadow: #E0E0E0;
--color-shadow: #e0e0e0;
--color-BtnText: #eaeaf0;
--color-textForgetPsd: blue;
--color-textFooter: #FFFFFF;
--color-line: rgba(128, 128, 128);
Expand All @@ -40,7 +38,7 @@ body {
--icon-signIn: 'fa fa-user-circle';

&.dark-theme {
--color-bg: #262626;
--color-bg: #282727;
--color-logo: #54d64d;
--color-bgReverse: #FFFFFF;
--color-text-title: #FFFFFF;
Expand All @@ -57,6 +55,7 @@ body {
--color-shadow: #3a3a3a;
--color-msgBg: #FFFFFF;
--icon-signIn: 'fa fa-user-circle-o';
--color-BtnText: #491212;
}

&.stop-scroll {
Expand Down
8 changes: 4 additions & 4 deletions blocks/common.blocks/socialmedia/__item/socialmedia__item.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
display: flex;
justify-content: center;
align-items: center;
font: 400 0.9rem var(--color-textBtn);
font: 400 0.9rem var(--font-family);
color: #fff;
border-radius: 5px;
text-decoration: none;
Expand All @@ -14,13 +14,13 @@
margin-bottom: 10px;

&:first-child{
background-color: var(--color-bgVK);
background-color: #1d4294;
}
&:nth-child(2) {
background-color: var(--color-bgTwitter);
background-color: #0c7bdc;
}
&:last-child {
background-color: var(--color-bgGoogle);
background-color: #de2734;
}

&:hover{
Expand Down
Loading

0 comments on commit 824262c

Please sign in to comment.