From 33d39d1a67845d22472de5fa443b011392a64203 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 11 May 2021 14:49:09 +0500 Subject: [PATCH 1/7] changes --- .../css/components/1-main/variables.scss | 2 +- .../css/components/2-layout/newsCard.scss | 3 +- .../css/components/2-layout/responsive.scss | 15 +++++- .../css/components/2-layout/swiper.scss | 2 +- .../assets/css/components/3-page/home.scss | 9 +++- themes/modern2/assets/css/main.css | 49 ++++++++++++++----- 6 files changed, 61 insertions(+), 19 deletions(-) diff --git a/themes/modern2/assets/css/components/1-main/variables.scss b/themes/modern2/assets/css/components/1-main/variables.scss index be6e35ce3..c3fe9c45a 100755 --- a/themes/modern2/assets/css/components/1-main/variables.scss +++ b/themes/modern2/assets/css/components/1-main/variables.scss @@ -12,5 +12,5 @@ $h3-size: 18px; $h3-height: 26px; $h4-size: 16px; $h4-height: 25px; -$h5-size: 12px; +$h5-size: 14px-; $h5-height: 20px; diff --git a/themes/modern2/assets/css/components/2-layout/newsCard.scss b/themes/modern2/assets/css/components/2-layout/newsCard.scss index cf342de26..961c83192 100755 --- a/themes/modern2/assets/css/components/2-layout/newsCard.scss +++ b/themes/modern2/assets/css/components/2-layout/newsCard.scss @@ -7,7 +7,6 @@ align-items: center; justify-content: space-between; position: relative; - &-category { padding: 5px 10px; background: $main-color; @@ -54,7 +53,7 @@ line-height: $h4-height; margin: 10px 0 0 0; display: block; - max-height: 75px; + height: 75px; overflow: hidden; text-overflow: ellipsis; } diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index c43eb609d..7d3c88c02 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -9,6 +9,11 @@ } } @include xlg-xxlg { + .swiper-slide-content-link { + font-size: 18px; + line-height: 25px; + height: 50px; + } .newsSlider { &__item { height: 280px; @@ -22,6 +27,14 @@ height: 350px; } } + .newsSlider .newsSlider__item { + padding: 0 5px 5px 10px; + height: 180px; + } + .header__slogan { + font-size: 28px; + line-height: 1; + } .auto__container { max-width: 1040px; padding: 0 25px; @@ -496,7 +509,7 @@ } } &__footer { - flex-direction: column; + flex-direction: column; -ms-flex-direction: column; } } diff --git a/themes/modern2/assets/css/components/2-layout/swiper.scss b/themes/modern2/assets/css/components/2-layout/swiper.scss index 829dff77c..280c07884 100755 --- a/themes/modern2/assets/css/components/2-layout/swiper.scss +++ b/themes/modern2/assets/css/components/2-layout/swiper.scss @@ -100,7 +100,7 @@ } &-link { color: $text-color-white; - font-size: 16px; + font-size: 20px; line-height: 30px; height: 60px; overflow: hidden; diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 8b861f94e..850d3bcf3 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -183,7 +183,14 @@ } } &-card { - margin: -100px 30px 0 30px; + margin: -200px 30px 0 30px; + border: 1px solid #dcdcdc; + .card { + border-bottom: 1px solid #dcdcdc; + &:last-child { + border-bottom: none; + } + } } &-title { font-size: $h3-size; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index d20f569e5..6e89616ef 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -197,7 +197,7 @@ li { justify-content: space-between; } .footer__copyright { - font-size: 12px; + font-size: 14px-; line-height: 20px; font-weight: 400; color: #ffffff; @@ -238,7 +238,7 @@ li { align-items: center; } .subheader .nav__inner-link { - font-size: 12px; + font-size: 14px-; line-height: 20px; font-weight: 400; color: #ffffff; @@ -276,7 +276,7 @@ li { .subheader .nav__inner-link .dropDown__link { display: block; padding: 15px; - font-size: 12px; + font-size: 14px-; line-height: 20px; font-weight: 400; color: #242424; @@ -593,7 +593,7 @@ li { .card__header-category { padding: 5px 10px; background: #fd4c24; - font-size: 12px; + font-size: 14px-; line-height: 20px; color: #ffffff; font-weight: 700; @@ -606,7 +606,7 @@ li { align-items: center; color: #a2a2a2; font-weight: 400; - font-size: 12px; + font-size: 14px-; line-height: 15px; } .card__header-view svg { @@ -618,7 +618,7 @@ li { .card__header-date { display: flex; align-items: center; - font-size: 12px; + font-size: 14px-; line-height: 20px; color: #a2a2a2; font-weight: 400; @@ -635,7 +635,7 @@ li { line-height: 25px; margin: 10px 0 0 0; display: block; - max-height: 75px; + height: 75px; overflow: hidden; text-overflow: ellipsis; } @@ -1116,7 +1116,7 @@ li { } .swiper-slide-content-link { color: #ffffff; - font-size: 16px; + font-size: 20px; line-height: 30px; height: 60px; overflow: hidden; @@ -1344,7 +1344,7 @@ li { background: #ffffff; } .main__body-header-link { - font-size: 12px; + font-size: 14px-; line-height: 20px; font-weight: 400; color: #a2a2a2; @@ -1352,7 +1352,14 @@ li { display: block; } .main__body-card { - margin: -100px 30px 0 30px; + margin: -200px 30px 0 30px; + border: 1px solid #dcdcdc; +} +.main__body-card .card { + border-bottom: 1px solid #dcdcdc; +} +.main__body-card .card:last-child { + border-bottom: none; } .main__body-title { font-size: 18px; @@ -1443,7 +1450,7 @@ li { background: #ffffff; } .event__header-link { - font-size: 12px; + font-size: 14px-; line-height: 20px; font-weight: 400; color: #a2a2a2; @@ -1602,7 +1609,7 @@ li { align-items: center; color: #a2a2a2; font-weight: 400; - font-size: 12px; + font-size: 14px-; line-height: 15px; } .heading__content-header-view svg { @@ -1613,7 +1620,7 @@ li { .heading__content-header-date { display: flex; align-items: center; - font-size: 12px; + font-size: 14px-; line-height: 20px; color: #ffffff; background: #242424; @@ -1969,6 +1976,12 @@ li { } } @media (max-width: 1400px) { + .swiper-slide-content-link { + font-size: 18px; + line-height: 25px; + height: 50px; + } + .newsSlider__item { height: 280px; } @@ -1981,6 +1994,16 @@ li { height: 350px; } + .newsSlider .newsSlider__item { + padding: 0 5px 5px 10px; + height: 180px; + } + + .header__slogan { + font-size: 28px; + line-height: 1; + } + .auto__container { max-width: 1040px; padding: 0 25px; From f25948025dfbd4caf751fe2579048f83179259b5 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 11 May 2021 14:59:21 +0500 Subject: [PATCH 2/7] changes --- .../css/components/2-layout/responsive.scss | 13 ++++++------ .../css/components/2-layout/subheader.scss | 2 +- .../assets/css/components/3-page/home.scss | 6 +++--- themes/modern2/assets/css/main.css | 21 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index 7d3c88c02..1f012a5c4 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -74,14 +74,17 @@ } } &-card { - position: unset; - width: 100%; - border: none; + top: 150px; + left: 10px; + width: calc(100% - 20px); } &-column { margin: 0 10px; width: calc(50% - 30px); padding: 0 15px; + .card { + padding: 15px 0; + } } } } @@ -115,9 +118,7 @@ } } } - .card { - padding: 15px; - } + .partner { &__title { margin-bottom: 40px; diff --git a/themes/modern2/assets/css/components/2-layout/subheader.scss b/themes/modern2/assets/css/components/2-layout/subheader.scss index c7910b8e2..a2dafc134 100755 --- a/themes/modern2/assets/css/components/2-layout/subheader.scss +++ b/themes/modern2/assets/css/components/2-layout/subheader.scss @@ -1,7 +1,7 @@ .subheader { background: $text-light-black; position: relative; - z-index: 1; + z-index: 2; .close { display: none; } diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 850d3bcf3..ef37bb412 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -183,7 +183,7 @@ } } &-card { - margin: -200px 30px 0 30px; + margin: -100px 30px 0 30px; border: 1px solid #dcdcdc; .card { border-bottom: 1px solid #dcdcdc; @@ -337,10 +337,10 @@ } &-card { position: absolute; - bottom: -30px; + top: 400px; left: 30px; width: calc(100% - 60px); - border: 1px solid #707070; + border: 1px solid #DCDCDC; } &-column { width: calc(50% - 100px); diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 6e89616ef..1de8cfb54 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -223,7 +223,7 @@ li { .subheader { background: #242424; position: relative; - z-index: 1; + z-index: 2; } .subheader .close { display: none; @@ -1352,7 +1352,7 @@ li { display: block; } .main__body-card { - margin: -200px 30px 0 30px; + margin: -100px 30px 0 30px; border: 1px solid #dcdcdc; } .main__body-card .card { @@ -1510,10 +1510,10 @@ li { } .event__body-card { position: absolute; - bottom: -30px; + top: 400px; left: 30px; width: calc(100% - 60px); - border: 1px solid #707070; + border: 1px solid #DCDCDC; } .event__body-column { width: calc(50% - 100px); @@ -2044,15 +2044,18 @@ li { height: 200px; } .event__body-card { - position: unset; - width: 100%; - border: none; + top: 150px; + left: 10px; + width: calc(100% - 20px); } .event__body-column { margin: 0 10px; width: calc(50% - 30px); padding: 0 15px; } + .event__body-column .card { + padding: 15px 0; + } .main__body-header { margin-bottom: 40px; @@ -2077,10 +2080,6 @@ li { font-size: 12px; } - .card { - padding: 15px; - } - .partner__title { margin-bottom: 40px; } From 41557b0ea4d98273d8b9bd3fce248c07efef9291 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 11 May 2021 15:07:04 +0500 Subject: [PATCH 3/7] sadfawsdg --- .../css/components/2-layout/newsSlider.scss | 12 ++++++--- .../css/components/2-layout/responsive.scss | 12 +++++++-- .../assets/css/components/3-page/home.scss | 3 ++- themes/modern2/assets/css/main.css | 25 ++++++++++++++----- 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/newsSlider.scss b/themes/modern2/assets/css/components/2-layout/newsSlider.scss index 6a9c8727a..481c492ac 100755 --- a/themes/modern2/assets/css/components/2-layout/newsSlider.scss +++ b/themes/modern2/assets/css/components/2-layout/newsSlider.scss @@ -1,7 +1,6 @@ .newsSlider { &__outer { position: relative; - margin: 0 -5px; overflow: hidden; .p2 { cursor: pointer; @@ -34,7 +33,6 @@ } .newsSlider__item { position: relative; - padding: 5px 5px; height: 320px; img { @include fullImage; @@ -66,8 +64,8 @@ &-link { color: $text-color-white; font-size: 16px; - line-height: 30px; - height: 60px; + line-height: 25px; + height: 50px; overflow: hidden; text-overflow: ellipsis; font-weight: 700; @@ -76,3 +74,9 @@ } } } +.slick-slider { + margin:0 -10px; +} +.slick-slide { + padding: 5px; +} \ No newline at end of file diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index 1f012a5c4..648bc26bb 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -28,9 +28,15 @@ } } .newsSlider .newsSlider__item { - padding: 0 5px 5px 10px; height: 180px; + &-content { + &-date { + max-width: 120px; + margin-bottom: 0; + } + } } + .header__slogan { font-size: 28px; line-height: 1; @@ -118,7 +124,9 @@ } } } - + .card { + padding: 15px; + } .partner { &__title { margin-bottom: 40px; diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index ef37bb412..0c0129366 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -340,7 +340,7 @@ top: 400px; left: 30px; width: calc(100% - 60px); - border: 1px solid #DCDCDC; + border: 1px solid #dcdcdc; } &-column { width: calc(50% - 100px); @@ -357,6 +357,7 @@ } } } + // event end // partner start .partner { diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 1de8cfb54..c18f58acb 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -931,7 +931,6 @@ li { .newsSlider__outer { position: relative; - margin: 0 -5px; overflow: hidden; } .newsSlider__outer .p2 { @@ -972,7 +971,6 @@ li { } .newsSlider .newsSlider__item { position: relative; - padding: 5px 5px; height: 320px; } .newsSlider .newsSlider__item img { @@ -1009,14 +1007,22 @@ li { .newsSlider .newsSlider__item-content-link { color: #ffffff; font-size: 16px; - line-height: 30px; - height: 60px; + line-height: 25px; + height: 50px; overflow: hidden; text-overflow: ellipsis; font-weight: 700; display: block; } +.slick-slider { + margin: 0 -10px; +} + +.slick-slide { + padding: 5px; +} + .swiper-container { width: calc(100% + 10px); height: 100%; @@ -1513,7 +1519,7 @@ li { top: 400px; left: 30px; width: calc(100% - 60px); - border: 1px solid #DCDCDC; + border: 1px solid #dcdcdc; } .event__body-column { width: calc(50% - 100px); @@ -1995,9 +2001,12 @@ li { } .newsSlider .newsSlider__item { - padding: 0 5px 5px 10px; height: 180px; } + .newsSlider .newsSlider__item-content-date { + max-width: 120px; + margin-bottom: 0; + } .header__slogan { font-size: 28px; @@ -2080,6 +2089,10 @@ li { font-size: 12px; } + .card { + padding: 15px; + } + .partner__title { margin-bottom: 40px; } From 5b5f7282ed5b6f5d1685c9babe425cc076e0a4f1 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 11 May 2021 15:10:51 +0500 Subject: [PATCH 4/7] dsafdsf --- themes/modern2/assets/css/components/2-layout/swiper.scss | 2 -- themes/modern2/assets/css/components/3-page/home.scss | 2 +- themes/modern2/assets/css/main.css | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/swiper.scss b/themes/modern2/assets/css/components/2-layout/swiper.scss index 280c07884..ae1c4f652 100755 --- a/themes/modern2/assets/css/components/2-layout/swiper.scss +++ b/themes/modern2/assets/css/components/2-layout/swiper.scss @@ -2,7 +2,6 @@ width: calc(100% + 10px); height: 100%; position: relative; - margin: 0 -5px; .p3 { cursor: pointer; position: absolute; @@ -55,7 +54,6 @@ align-items: center; overflow: hidden; @include transition; - margin: 5px; &-image { width: 100%; height: 100%; diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 0c0129366..1973fbe6f 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -337,7 +337,7 @@ } &-card { position: absolute; - top: 400px; + top: 210px; left: 30px; width: calc(100% - 60px); border: 1px solid #dcdcdc; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index c18f58acb..47a70d9c9 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -1027,7 +1027,6 @@ li { width: calc(100% + 10px); height: 100%; position: relative; - margin: 0 -5px; } .swiper-container .p3 { cursor: pointer; @@ -1080,7 +1079,6 @@ li { overflow: hidden; transition: all 0.2s ease-in-out 0s; -moz-transition: all 0.2s ease-in-out 0s; - margin: 5px; } .swiper-slide-image { width: 100%; @@ -1516,7 +1514,7 @@ li { } .event__body-card { position: absolute; - top: 400px; + top: 210px; left: 30px; width: calc(100% - 60px); border: 1px solid #dcdcdc; From 68e9baa5f13fb17d9261b95cd91f44baaef986e7 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 11 May 2021 15:13:56 +0500 Subject: [PATCH 5/7] dsfhdsfhdsfh --- .../assets/css/components/2-layout/newsSlider.scss | 12 ++++++------ themes/modern2/assets/css/main.css | 14 ++++++-------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/newsSlider.scss b/themes/modern2/assets/css/components/2-layout/newsSlider.scss index 481c492ac..b4982defa 100755 --- a/themes/modern2/assets/css/components/2-layout/newsSlider.scss +++ b/themes/modern2/assets/css/components/2-layout/newsSlider.scss @@ -1,4 +1,10 @@ .newsSlider { + .slick-slider { + margin: 0 -10px; + } + .slick-slide { + padding: 5px; + } &__outer { position: relative; overflow: hidden; @@ -74,9 +80,3 @@ } } } -.slick-slider { - margin:0 -10px; -} -.slick-slide { - padding: 5px; -} \ No newline at end of file diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 47a70d9c9..c9ecc3dc6 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -929,6 +929,12 @@ li { background-color: #2495f3; } +.newsSlider .slick-slider { + margin: 0 -10px; +} +.newsSlider .slick-slide { + padding: 5px; +} .newsSlider__outer { position: relative; overflow: hidden; @@ -1015,14 +1021,6 @@ li { display: block; } -.slick-slider { - margin: 0 -10px; -} - -.slick-slide { - padding: 5px; -} - .swiper-container { width: calc(100% + 10px); height: 100%; From ea4303a93c80c7e368972430d790b79fb4dce54f Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 11 May 2021 15:15:05 +0500 Subject: [PATCH 6/7] tyfghujm --- .../css/components/2-layout/swiper.scss | 273 +++++++++--------- themes/modern2/assets/css/main.css | 2 +- 2 files changed, 138 insertions(+), 137 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/swiper.scss b/themes/modern2/assets/css/components/2-layout/swiper.scss index ae1c4f652..e30e01a7c 100755 --- a/themes/modern2/assets/css/components/2-layout/swiper.scss +++ b/themes/modern2/assets/css/components/2-layout/swiper.scss @@ -1,151 +1,152 @@ .swiper-container { - width: calc(100% + 10px); - height: 100%; - position: relative; - .p3 { - cursor: pointer; - position: absolute; - top: 50%; - left: 5px; - @include transformY; - width: 30px; - height: 40px; - background: rgba($color: #000000, $alpha: 0.5); - display: flex; - align-items: center; - justify-content: center; - z-index: 1; - } - .n3 { - cursor: pointer; - position: absolute; - z-index: 1; - top: 50%; - right: 5px; - @include transformY; - width: 30px; - height: 40px; - background: rgba($color: #000000, $alpha: 0.5); - display: flex; - align-items: center; - justify-content: center; - } - .slick-list { - padding: 0 33.3% 0 0; - } + width: 100%; + height: 100%; + position: relative; + + .p3 { + cursor: pointer; + position: absolute; + top: 50%; + left: 5px; + @include transformY; + width: 30px; + height: 40px; + background: rgba($color: #000000, $alpha: 0.5); + display: flex; + align-items: center; + justify-content: center; + z-index: 1; + } + .n3 { + cursor: pointer; + position: absolute; + z-index: 1; + top: 50%; + right: 5px; + @include transformY; + width: 30px; + height: 40px; + background: rgba($color: #000000, $alpha: 0.5); + display: flex; + align-items: center; + justify-content: center; + } + .slick-list { + padding: 0 33.3% 0 0; + } } .swiper-slide { - text-align: center; - font-size: 18px; - height: 520px; - /* Center slide t ext vertically */ - display: -webkit-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - -webkit-box-pack: center; - -ms-flex-pack: center; - -webkit-justify-content: center; - justify-content: center; - -webkit-box-align: center; - -ms-flex-align: center; - -webkit-align-items: center; - align-items: center; - overflow: hidden; - @include transition; - &-image { - width: 100%; - height: 100%; - position: absolute; - transform-origin: 0% 50%; - position: relative; - } - &-content { - position: absolute; - left: 0; - bottom: 0; - display: none; - width: calc(100% - 80px); - background: rgb(0, 0, 0); - background: linear-gradient( - 0deg, - rgba(0, 0, 0, 1) 0%, - rgba(0, 0, 0, 0.022846638655462215) 100% - ); - padding: 50px 40px; + text-align: center; + font-size: 18px; + height: 520px; + /* Center slide t ext vertically */ + display: -webkit-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-box-align: center; + -ms-flex-align: center; + -webkit-align-items: center; + align-items: center; + overflow: hidden; + @include transition; + &-image { + width: 100%; + height: 100%; + position: absolute; + transform-origin: 0% 50%; + position: relative; + } + &-content { + position: absolute; + left: 0; + bottom: 0; + display: none; + width: calc(100% - 80px); + background: rgb(0, 0, 0); + background: linear-gradient( + 0deg, + rgba(0, 0, 0, 1) 0%, + rgba(0, 0, 0, 0.022846638655462215) 100% + ); + padding: 50px 40px; - &-date { - display: flex; - align-items: center; - justify-content: flex-start; - font-size: 14px; - line-height: 18px; - font-weight: 400; - color: $text-color-white; - margin-bottom: 10px; - svg { - margin: 0 4px; - width: 4px; - height: 4px; - fill: $text-color-white; - } + &-date { + display: flex; + align-items: center; + justify-content: flex-start; + font-size: 14px; + line-height: 18px; + font-weight: 400; + color: $text-color-white; + margin-bottom: 10px; + svg { + margin: 0 4px; + width: 4px; + height: 4px; + fill: $text-color-white; + } + } + &-footer { + display: flex; + align-items: center; + justify-content: space-between; + } + &-link { + color: $text-color-white; + font-size: 20px; + line-height: 30px; + height: 60px; + overflow: hidden; + text-overflow: ellipsis; + font-weight: 700; + display: block; + text-align: left; + width: 75%; + } + &-category { + color: 14px; + line-height: 18px; + font-weight: 700; + color: $text-color-white; + padding: 8px 16px; + background: $main-color; + } } - &-footer { - display: flex; - align-items: center; - justify-content: space-between; + &.slick-active .swiper-slide-content { + display: block; + animation: myAnim 1s ease 0s 1 normal forwards; + animation-delay: 0.5; } - &-link { - color: $text-color-white; - font-size: 20px; - line-height: 30px; - height: 60px; - overflow: hidden; - text-overflow: ellipsis; - font-weight: 700; - display: block; - text-align: left; - width: 75%; - } - &-category { - color: 14px; - line-height: 18px; - font-weight: 700; - color: $text-color-white; - padding: 8px 16px; - background: $main-color; - } - } - &.slick-active .swiper-slide-content { - display: block; - animation: myAnim 1s ease 0s 1 normal forwards; - animation-delay: 0.5; - } } .copy { - position: absolute; - bottom: 15px; - left: 0; - right: 0; - text-align: center; - color: white; - letter-spacing: 0.06em; + position: absolute; + bottom: 15px; + left: 0; + right: 0; + text-align: center; + color: white; + letter-spacing: 0.06em; } .swiper-slide img { - display: block; - width: 100%; - height: 100%; - object-fit: cover; + display: block; + width: 100%; + height: 100%; + object-fit: cover; } @keyframes myAnim { - 0% { - opacity: 0; - transform: translateY(250px); - } + 0% { + opacity: 0; + transform: translateY(250px); + } - 100% { - opacity: 1; - transform: translateY(0); - } + 100% { + opacity: 1; + transform: translateY(0); + } } diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index c9ecc3dc6..f9fdf08b5 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -1022,7 +1022,7 @@ li { } .swiper-container { - width: calc(100% + 10px); + width: 100%; height: 100%; position: relative; } From c6dbd1b8d80844e3c612cad8ea866852da71026e Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 11 May 2021 15:23:45 +0500 Subject: [PATCH 7/7] adsf --- .../css/components/1-main/variables.scss | 2 +- .../css/components/2-layout/newsSlider.scss | 12 +- .../assets/css/components/3-page/heading.scss | 286 +++++++++--------- themes/modern2/assets/css/main.css | 48 +-- 4 files changed, 175 insertions(+), 173 deletions(-) diff --git a/themes/modern2/assets/css/components/1-main/variables.scss b/themes/modern2/assets/css/components/1-main/variables.scss index c3fe9c45a..e6be54bea 100755 --- a/themes/modern2/assets/css/components/1-main/variables.scss +++ b/themes/modern2/assets/css/components/1-main/variables.scss @@ -8,7 +8,7 @@ $p-size: 16px; $p-height: 30px; $h2-size: 22px; $h2-height: 30px; -$h3-size: 18px; +$h3-size: 20px; $h3-height: 26px; $h4-size: 16px; $h4-height: 25px; diff --git a/themes/modern2/assets/css/components/2-layout/newsSlider.scss b/themes/modern2/assets/css/components/2-layout/newsSlider.scss index b4982defa..2b9b7c3ee 100755 --- a/themes/modern2/assets/css/components/2-layout/newsSlider.scss +++ b/themes/modern2/assets/css/components/2-layout/newsSlider.scss @@ -1,10 +1,4 @@ .newsSlider { - .slick-slider { - margin: 0 -10px; - } - .slick-slide { - padding: 5px; - } &__outer { position: relative; overflow: hidden; @@ -80,3 +74,9 @@ } } } +.slick-slider { + margin: 0 -10px; +} +.slick-slide { + padding: 5px; +} diff --git a/themes/modern2/assets/css/components/3-page/heading.scss b/themes/modern2/assets/css/components/3-page/heading.scss index 0046bad39..db2717195 100755 --- a/themes/modern2/assets/css/components/3-page/heading.scss +++ b/themes/modern2/assets/css/components/3-page/heading.scss @@ -1,154 +1,154 @@ .heading { - &__title { - font-weight: 700; - color: $text-light-black; - font-size: $h3-size; - line-height: $h3-height; - margin-bottom: 80px; - } - &__row { - display: flex; - align-items: center; - margin-bottom: 80px; - } - &__image { - width: 40%; - } - a.progressive { - position: relative; - display: block; - overflow: hidden; - outline: none; - height: 320px; - &:not(.replace) { - cursor: default; - } - & img { - @include fullImage; - } - & img.preview { - filter: blur(2vw); - transform: scale(1.05); - } - & img.reveal { - position: absolute; - left: 0; - top: 0; - will-change: transform, opacity; - animation: reveal 1s ease-out; - } - } - &__content { - width: calc(60% - 40px); - height: calc(100% - 80px); - padding: 40px 0 40px 40px; - &-header { - display: flex; - align-items: center; - justify-content: space-between; - margin-bottom: 30px; - &-view { - display: flex; - align-items: center; - color: $text-color-grey; - font-weight: 400; - font-size: $h5-size; - line-height: $h5-height - 5px; - svg { - margin-right: 5px; - stroke: $text-color-grey; - width: 21px; - } - } - &-date { - display: flex; - align-items: center; - font-size: $h5-size; - line-height: $h5-height; - color: $text-color-white; - background: $text-light-black; - font-weight: 400; - padding: 5px 15px; - svg { - margin: 0 5px; - } - } - } - &-body { - &-link { - color: $text-black; + &__title { font-weight: 700; - font-size: $h4-size; - line-height: $h4-height; - margin: 10px 0 0 0; - display: block; - height: 60px; - overflow: hidden; - text-overflow: ellipsis; - margin-bottom: 20px; - } - &-para { - font-size: $h4-size; - line-height: $h4-height; - font-weight: 400; color: $text-light-black; - height: 120px; - overflow: hidden; - text-overflow: ellipsis; - } - } - } - &__footer { - display: flex; - align-items: center; - &-page { - width: 40px; - height: 40px; - display: flex; - align-items: center; - justify-content: center; - background: $text-light-black; - svg { - width: 12px; - height: 12px; - fill: $text-color-white; - } - } - &-input { - width: 80px; - height: 40px; - margin: 0 10px; - - input { - text-align: center; font-size: $h3-size; line-height: $h3-height; - height: 100%; - width: 100%; - border-radius: 5px; - background: #e6e6e6; - font-weight: 400; - color: $text-light-black; - } + margin-bottom: 80px; } - span { - font-size: $h3-size; - line-height: $h3-height; - color: $text-light-black; - font-weight: 400; - margin-left: 10px; + &__row { + display: flex; + align-items: center; + margin-bottom: 80px; + } + &__image { + width: 40%; + } + a.progressive { + position: relative; + display: block; + overflow: hidden; + outline: none; + height: 320px; + &:not(.replace) { + cursor: default; + } + & img { + @include fullImage; + } + & img.preview { + filter: blur(2vw); + transform: scale(1.05); + } + & img.reveal { + position: absolute; + left: 0; + top: 0; + will-change: transform, opacity; + animation: reveal 1s ease-out; + } + } + &__content { + width: calc(60% - 40px); + height: calc(100% - 80px); + padding: 40px 0 40px 40px; + &-header { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 30px; + &-view { + display: flex; + align-items: center; + color: $text-color-grey; + font-weight: 400; + font-size: $h5-size; + line-height: $h5-height - 5px; + svg { + margin-right: 5px; + stroke: $text-color-grey; + width: 21px; + } + } + &-date { + display: flex; + align-items: center; + font-size: $h5-size; + line-height: $h5-height; + color: $text-color-white; + background: $text-light-black; + font-weight: 400; + padding: 5px 15px; + svg { + margin: 0 5px; + } + } + } + &-body { + &-link { + color: $text-black; + font-weight: 700; + font-size: $h4-size; + line-height: $h4-height; + margin: 10px 0 0 0; + display: block; + height: 50px; + overflow: hidden; + text-overflow: ellipsis; + margin-bottom: 20px; + } + &-para { + font-size: $h4-size; + line-height: $h4-height; + font-weight: 400; + color: $text-light-black; + height: 100px; + overflow: hidden; + text-overflow: ellipsis; + } + } + } + &__footer { + display: flex; + align-items: center; + &-page { + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + background: $text-light-black; + svg { + width: 12px; + height: 12px; + fill: $text-color-white; + } + } + &-input { + width: 80px; + height: 40px; + margin: 0 10px; + + input { + text-align: center; + font-size: $h3-size; + line-height: $h3-height; + height: 100%; + width: 100%; + border-radius: 5px; + background: #e6e6e6; + font-weight: 400; + color: $text-light-black; + } + } + span { + font-size: $h3-size; + line-height: $h3-height; + color: $text-light-black; + font-weight: 400; + margin-left: 10px; + } } - } } .address { - &__inner { - font-size: $h3-size; - line-height: $h3-height; - color: $text-light-black; - font-weight: 400; - margin-bottom: 25px; - span { - font-weight: 700; + &__inner { + font-size: $h3-size; + line-height: $h3-height; + color: $text-light-black; + font-weight: 400; + margin-bottom: 25px; + span { + font-weight: 700; + } } - } } diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index f9fdf08b5..6fef90a58 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -795,7 +795,7 @@ li { display: flex; justify-content: center; align-items: center; - font-size: 18px; + font-size: 20px; line-height: 26px; font-weight: 700; padding: 10px 0; @@ -811,7 +811,7 @@ li { background-position: center center; background-size: contain; background-repeat: no-repeat; - font-size: 15px; + font-size: 17px; line-height: 23px; justify-content: center; align-items: center; @@ -929,12 +929,6 @@ li { background-color: #2495f3; } -.newsSlider .slick-slider { - margin: 0 -10px; -} -.newsSlider .slick-slide { - padding: 5px; -} .newsSlider__outer { position: relative; overflow: hidden; @@ -1021,6 +1015,14 @@ li { display: block; } +.slick-slider { + margin: 0 -10px; +} + +.slick-slide { + padding: 5px; +} + .swiper-container { width: 100%; height: 100%; @@ -1339,7 +1341,7 @@ li { z-index: -1; } .main__body-header-title { - font-size: 18px; + font-size: 20px; line-height: 26px; font-weight: 700; color: #242424; @@ -1364,7 +1366,7 @@ li { border-bottom: none; } .main__body-title { - font-size: 18px; + font-size: 20px; line-height: 26px; font-weight: 700; color: #242424; @@ -1445,7 +1447,7 @@ li { position: relative; } .event__header-title { - font-size: 18px; + font-size: 20px; line-height: 26px; font-weight: 700; color: #242424; @@ -1535,7 +1537,7 @@ li { margin-bottom: 80px; } .partner__title { - font-size: 18px; + font-size: 20px; line-height: 26px; font-weight: 700; color: #242424; @@ -1556,7 +1558,7 @@ li { .heading__title { font-weight: 700; color: #242424; - font-size: 18px; + font-size: 20px; line-height: 26px; margin-bottom: 80px; } @@ -1639,7 +1641,7 @@ li { line-height: 25px; margin: 10px 0 0 0; display: block; - height: 60px; + height: 50px; overflow: hidden; text-overflow: ellipsis; margin-bottom: 20px; @@ -1649,7 +1651,7 @@ li { line-height: 25px; font-weight: 400; color: #242424; - height: 120px; + height: 100px; overflow: hidden; text-overflow: ellipsis; } @@ -1677,7 +1679,7 @@ li { } .heading__footer-input input { text-align: center; - font-size: 18px; + font-size: 20px; line-height: 26px; height: 100%; width: 100%; @@ -1687,7 +1689,7 @@ li { color: #242424; } .heading__footer span { - font-size: 18px; + font-size: 20px; line-height: 26px; color: #242424; font-weight: 400; @@ -1695,7 +1697,7 @@ li { } .address__inner { - font-size: 18px; + font-size: 20px; line-height: 26px; color: #242424; font-weight: 400; @@ -1715,7 +1717,7 @@ li { color: #242424; } .about__para { - font-size: 18px; + font-size: 20px; line-height: 40px; font-weight: 400; color: #242424; @@ -1725,7 +1727,7 @@ li { .form__title { font-weight: 700; color: #242424; - font-size: 18px; + font-size: 20px; line-height: 26px; margin-bottom: 80px; } @@ -1860,7 +1862,7 @@ li { .news__date { display: flex; align-items: center; - font-size: 18px; + font-size: 20px; line-height: 26px; color: #a2a2a2; font-weight: 400; @@ -1912,7 +1914,7 @@ li { padding: 80px 0; } .terms__title { - font-size: 18px; + font-size: 20px; line-height: 26px; font-weight: 700; color: #000; @@ -2235,7 +2237,7 @@ li { text-align: center; margin-right: 0; padding: 20px; - font-size: 18px; + font-size: 20px; line-height: 26px; font-weight: 700; width: calc(100% - 40px);