Skip to content

Commit

Permalink
updated modal windows, added new views, config turbo frame
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegPhenomenon committed Sep 12, 2023
1 parent 314e496 commit 38e5453
Show file tree
Hide file tree
Showing 68 changed files with 6,910 additions and 6,168 deletions.
354 changes: 324 additions & 30 deletions app/assets/builds/application.css

Large diffs are not rendered by default.

11,655 changes: 5,833 additions & 5,822 deletions app/assets/builds/application.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions app/assets/builds/application.js.map

Large diffs are not rendered by default.

44 changes: 18 additions & 26 deletions app/assets/stylesheets/components/_account.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@

.c-account__title{
margin: 0;
}
.c-account--mainpage{
.c-account_editicons {
&> svg:first-child{
display: none;
}
}
}
.c-account_editicons {
gap: 8px;
position: absolute;
Expand All @@ -17,7 +23,7 @@
cursor: pointer;
opacity: 1;
transition: opacity .3s;
&:not(:first-child){
&:nth-last-child(-n + 2){
display: none;
}
&:hover{
Expand All @@ -26,33 +32,17 @@
}

&.is-editable{
.c-account_editicons--reset{
display: inline-flex;
svg{
display: block;
}
}
>svg{
&:not(:first-child){
&:nth-last-child(-n + 2){
display: inline-flex;
}
&:first-child{
&:nth-child(-n + 2){
display: none;
}
}
}
}
.c-account_editicons--reset{
display: none;
padding: 0;
border: 0;
background-color: transparent;
opacity: 1;
transition: opacity .3s;
&:hover{
opacity: .7;
}
}

.c-account__input-wrapper {
flex-wrap: wrap;
gap: 0;
Expand All @@ -63,13 +53,15 @@
justify-content: flex-start;
}
.c-account__input {
width: 50%;
width: 100%;
flex-shrink: 0;
@include mq(mobile){
width: 50%;
}
@include mq(tablet){
width: 131px;
}
&:last-child{
margin-bottom: 0;
@include mq(tablet){
width: 165px;
}
Expand All @@ -96,12 +88,12 @@
}
}
.c-account__input--editable{
input{
input,select{
border-color: transparent;
transition: border .5s;
}
&.is-editable{
input{
input,select{
border: 1px solid #e2e2e2;
}
}
Expand All @@ -119,7 +111,7 @@
font-weight: 500;
line-height: rem(24px);
}
a.c-acount__link {
.c-acount__link {
color: $primary-blue-color;
font-size: rem(14px);
font-weight: 500;
Expand Down
82 changes: 82 additions & 0 deletions app/assets/stylesheets/components/_address.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
.c-account--adresses{
input{
max-width: 550px;
}
.c-account__input-title{
gap: 40px;
input{
border-radius: 0;
}
&.is-editable{
input{
border-color: transparent;
border-bottom-color: $grey-200-color;
}
}
}
.c-account__input-wrapper{
max-width: 100%;
flex-wrap: wrap;
gap: 8px;
@include mq(tablet){
gap: 16px;
}
.c-account__input{
input{
width: 100%;
}
select {
cursor: pointer;
min-width: 62px;
width: fit-content;
background-position: right 0.6rem center;
}
&:nth-child(1){
width: 100%;
}
&:nth-child(2) {
width: 88px;
}
&:nth-child(3) {
width: 88px;
}
&:nth-child(4) {
width: fit-content;
}
@include mq(tablet){
&:nth-child(1){
width: 200px;
}
&:nth-child(2) {
width: 130px;
}
&:nth-child(3) {
width: 108px;
}
}
@include mq(desktop){
&:nth-child(1){
width: 100%;
}
&:nth-child(2) {
width: 88px;
}
&:nth-child(3) {
width: 88px;
}
}
@include mq(menu){
&:nth-child(1){
width: 200px;
}
&:nth-child(2) {
width: 130px;
}
&:nth-child(3) {
width: 108px;
}
}
}

}
}
4 changes: 4 additions & 0 deletions app/assets/stylesheets/components/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
@import "notices";
@import "login";
@import "account";
@import "table-whishlist";
@import "wishlist";
@import "address";
@import "pagy";
14 changes: 14 additions & 0 deletions app/assets/stylesheets/components/_cta.scss
Original file line number Diff line number Diff line change
Expand Up @@ -264,4 +264,18 @@

.c-cta--inline {
padding: 0;
}
.c-cta--wishlist{
background: #fff;
margin-bottom: rem(24px);
padding-bottom: 60px;
box-shadow: 0 0 48px rgba(0,0,0,.12);
@include mq(tablet){
margin-bottom: rem(40px);
padding-bottom: 0px;
box-shadow:unset;
}
@include mq(laptop){
margin-bottom: rem(60px);
}
}
78 changes: 78 additions & 0 deletions app/assets/stylesheets/components/_table-whishlist.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
.c-wishlist__table{
tr{
th{
white-space: nowrap;
}
}
tbody{
margin-top: rem(24px);
@include mq(laptop){
margin-top: rem(30px);
}
@include mq(laptop){
margin-top: 0;
}
tr{
td{
&:nth-child(1){
order: 2;
margin-left: auto;
font-weight: 800;
@include mq(laptop){
order: 1;
margin-left: 0;
font-weight: 500;
}
}
&:nth-child(2){
font-weight: 800;
order: 1;
margin-left: 0;
max-width: 90%;
margin-bottom: rem(8px);
@include mq(laptop){
order: 2;
width: 100%;
margin-bottom: 0;
}
}
&:nth-child(3){
order: 3;
margin-bottom: rem(14px);
@include mq(laptop){
margin-bottom: 0;
}
}
&:nth-child(4){
order: 4;
}
}
}
}

}

.c-table__filters__search--whishlist{
margin: 0 -1rem;
@include mq(tablet){
margin: auto;
}
.c-table__filters__search{
text-align: left;
}
input{
width: rem(180px);
margin-right: rem(5px);
font-size: rem(12px);

@include mq(mobile){
width: rem(255px);
margin-right: rem(16px);
font-size: rem(14px);
}
@include mq(laptop){
width: 550px;
}

}
}
16 changes: 16 additions & 0 deletions app/assets/stylesheets/components/_wishlist.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.c-whishlist__notice{
font-size: rem(14px);
font-weight: 500;
line-height: rem(24px);
display: inline-block;
padding-top: 30px;
@include mq(tablet){
padding-top: 40px;
}
@include mq(laptop){
padding-top: 60px;
}
}
.c-wishlist__btn{
font-size: rem(14px);
}
16 changes: 15 additions & 1 deletion app/assets/stylesheets/objects/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
grid-template-columns: repeat(2, 1fr);
}
}

.o-grid--two-col-laptop {
@include mq(laptop) {
grid-template-columns: repeat(2, 1fr);
}
}
.o-grid--two-col-desktop {
@include mq(desktop) {
grid-template-columns: repeat(2, 1fr);
Expand All @@ -38,6 +42,16 @@
}
}


.o-grid--sep {
row-gap: rem(48px);
}
.o-grid--wishlist{
row-gap: rem(24px);
@include mq(tablet){
row-gap: rem(40px);
}
@include mq(laptop){
row-gap: 0;
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tools/_mq.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$mq-breakpoints: (
mobile: 320px,
mobile: 374px,
tablet: 768px,
laptop: 992px,
desktop: 1120px,
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/utilities/_flexbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@

.u-flex-gap-24 {
gap: rem(24px)
}
}
7 changes: 6 additions & 1 deletion app/assets/stylesheets/utilities/_margin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
.u-mt-48 {
margin-top: rem(48px);
}
.u-mt-60 {
margin-top: rem(60px);
}

.u-mt-8 {
margin-top: rem(8px);
Expand All @@ -25,7 +28,9 @@
margin-top: rem(40px);
}
}

.u-mb-60 {
margin-bottom: rem(60px);
}
.u-mb-48 {
margin-bottom: rem(48px);
}
Expand Down
Loading

0 comments on commit 38e5453

Please sign in to comment.