Skip to content

Commit e996972

Browse files
committed
fixed styling in 2 components and fixed responsivness in them, fixed some sizin and button positioning.
1 parent fcc8d0f commit e996972

File tree

7 files changed

+36
-6
lines changed

7 files changed

+36
-6
lines changed

src/app/common/components/ArtGallery/ArtGalleryBlock.styles.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,25 @@
44
@use "@sass/mixins/_utils.mixins.scss" as mut;
55
@use "@sass/mixins/_wrapper.mixins.scss" as wr;
66
@use "@sass/mixins/_vendor.mixins.scss" as vnd;
7+
@use "@features/SlickSlider/SlickSlider.styles.scss" as ss;
78

89
.artGalleryContainer .blockHeadingWrapper{
910
margin-bottom: pxToRem(10px);
1011
}
1112

13+
.artGalleryContainer {
14+
.slick-next:before {
15+
@include ss.slick-arrow-pseudo(Right, -23px)
16+
}
17+
18+
.slick-prev:before {
19+
@include ss.slick-arrow-pseudo(Left, 0px)
20+
}
21+
}
22+
23+
1224
.artGallerySliderContainer .sliderClass .slick-slider {
1325
width: 100%;
14-
1526
.slick-dots {
1627
padding: 0 pxToRem(16px);
1728
bottom: pxToRem(-40px);
@@ -43,6 +54,7 @@
4354
width: pxToRem(1045.5px);
4455
}
4556
}
57+
4658
}
4759
}
4860
}

src/app/common/components/ArtGallery/components/OneAndTwoAndThreeAndFour/OneAndTwoAndThreeAndFourSlide.styles.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
"img1 img3"
1212
"img2 img4";
1313

14+
@media screen and (max-width: 1024px) {
15+
grid-template-columns: repeat(2, minmax(auto, pxToRem(s.$art-gallery-img-size) - 1rem));
16+
}
17+
18+
@media screen and (max-width: 768px) {
19+
grid-template-columns: repeat(2, pxToRem(s.$art-gallery-img-size-mobile + 52px));
20+
}
21+
1422
@media screen and (max-width: 680px) {
1523
grid-template-columns: repeat(2, pxToRem(s.$art-gallery-img-size-mobile));
1624
width: pxToRem(s.$art-gallery-img-size-mobile * 2 + s.$art-gallery-gap-mobile);

src/app/common/components/ArtGallery/components/OneAndTwoAndThreeToFour/OneAndTwoAndThreeToFourSlide.styles.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
grid-template-areas:
1111
"img1 img3"
1212
"img2 img3";
13+
14+
@media screen and (max-width: 1024px) {
15+
grid-template-columns: repeat(2, minmax(auto, pxToRem(s.$art-gallery-img-size) - 1rem));
16+
}
17+
18+
@media screen and (max-width: 768px) {
19+
grid-template-columns: repeat(2, pxToRem(s.$art-gallery-img-size-mobile + 52px));
20+
}
1321

1422
@media screen and (max-width: 680px) {
1523
grid-template-columns: repeat(2, pxToRem(s.$art-gallery-img-size-mobile));

src/app/common/components/ArtGallery/components/OneToFourSlide/OneToFourSlide.styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@include mut.flex-center();
77

88
.droppable, .baseArtSlideImageWrapper{
9-
width: pxToRem(s.$art-gallery-img-size * 2.6);
9+
width: pxToRem(s.$art-gallery-img-size * 2.12);
1010
@media screen and (max-width: 768px){
1111
width: pxToRem(s.$art-gallery-img-size-mobile * 2.6);
1212
}

src/app/common/components/ArtGallery/components/OneToTwoAndThreeToFourAndFiveToSixSlide/OneToTwoAndThreeToFourAndFiveToSixSlide.styles.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
width: pxToRem(s.$art-gallery-img-size-mobile * 1.2);
1212
}
1313
}
14+
15+
1416
@media screen and (max-width: 680px){
1517
width: pxToRem(s.$art-gallery-img-size-mobile * 3 + s.$art-gallery-gap-mobile * 2);
1618
}

src/app/common/constants/api-routes.constants.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ export const API_ROUTES = {
201201
DELETE: 'coordinate/delete',
202202
},
203203
USERS: {
204-
LOGIN: 'user/login',
205-
REFRESH_TOKEN: 'user/refreshToken',
206-
REGISTER: 'user/register',
204+
LOGIN: 'auth/login',
205+
REFRESH_TOKEN: 'auth/refreshToken',
206+
REGISTER: 'auth/register',
207207
},
208208
EMAIL: {
209209
SEND: 'email/send',

src/assets/sass/mixins/_utils.mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
justify-content: center;
309309
align-content: center;
310310
grid-template-columns: repeat($cols, 1fr);
311-
grid-template-rows: repeat($rows, minmax(auto, 253px));
311+
grid-template-rows: repeat($rows, minmax(11rem, 253px));
312312
}
313313

314314
@mixin list-styles($type) {

0 commit comments

Comments
 (0)