diff --git a/themes/modern2/assets/css/components/1-main/variables.scss b/themes/modern2/assets/css/components/1-main/variables.scss index e6be54bea..52f957d0e 100644 --- a/themes/modern2/assets/css/components/1-main/variables.scss +++ b/themes/modern2/assets/css/components/1-main/variables.scss @@ -5,12 +5,12 @@ $text-color-white: #ffffff; $text-color-grey: #a2a2a2; $color-grey: #b4b4b4; $p-size: 16px; -$p-height: 30px; +$p-height: 26px; $h2-size: 22px; -$h2-height: 30px; +$h2-height: 28px; $h3-size: 20px; -$h3-height: 26px; +$h3-height: 24px; $h4-size: 16px; -$h4-height: 25px; -$h5-size: 14px-; +$h4-height: 20px; +$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 19547b71c..00584a703 100644 --- a/themes/modern2/assets/css/components/2-layout/newsCard.scss +++ b/themes/modern2/assets/css/components/2-layout/newsCard.scss @@ -1,6 +1,6 @@ .card { position: relative; - padding: 30px; + padding: 25px; background: $text-color-white; &__header { display: flex; @@ -35,7 +35,7 @@ &-date { display: flex; align-items: center; - font-size: $h5-size; + font-size: 12px; line-height: $h5-height; color: $text-color-grey; font-weight: 400; @@ -48,12 +48,18 @@ } &__link { color: $text-black; - font-weight: 700; - font-size: $h4-size; - line-height: $h4-height; + font-weight: 500; + font-size: 15px; + line-height: 20px; margin: 10px 0 0 0; display: block; - height: 75px; + height: 60px; + //overflow: hidden; + //text-overflow: ellipsis; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; 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 e7c1da854..3c342b5a2 100644 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -64,7 +64,7 @@ } } .event { - margin: 40px 0; + margin: 40px 0 70px; &__header { margin-bottom: 40px; } diff --git a/themes/modern2/assets/css/components/3-page/about.scss b/themes/modern2/assets/css/components/3-page/about.scss index ca11fead1..f92ece3de 100644 --- a/themes/modern2/assets/css/components/3-page/about.scss +++ b/themes/modern2/assets/css/components/3-page/about.scss @@ -11,6 +11,6 @@ line-height: $h3-height + 14px; font-weight: 400; color: $text-light-black; - margin-top: 30px; + margin-top: 20px; } } diff --git a/themes/modern2/assets/css/components/3-page/heading.scss b/themes/modern2/assets/css/components/3-page/heading.scss index db2717195..644e96406 100644 --- a/themes/modern2/assets/css/components/3-page/heading.scss +++ b/themes/modern2/assets/css/components/3-page/heading.scss @@ -9,7 +9,7 @@ &__row { display: flex; align-items: center; - margin-bottom: 80px; + margin-bottom: 40px; } &__image { width: 40%; @@ -39,14 +39,14 @@ } } &__content { - width: calc(60% - 40px); - height: calc(100% - 80px); - padding: 40px 0 40px 40px; + width: calc(60% - 30px); + height: calc(100% - 60px); + padding: 30px 0 30px 30px; &-header { display: flex; align-items: center; justify-content: space-between; - margin-bottom: 30px; + margin-bottom: 20px; &-view { display: flex; align-items: center; @@ -82,10 +82,10 @@ line-height: $h4-height; margin: 10px 0 0 0; display: block; - height: 50px; + height: 40px; overflow: hidden; text-overflow: ellipsis; - margin-bottom: 20px; + margin-bottom: 15px; } &-para { font-size: $h4-size; diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 4f17e5cdb..b1f3de9ea 100644 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -95,7 +95,7 @@ } // main start .main { - margin-top: 70px; + margin-top: 30px; &__inner { display: flex; align-items: stretch; @@ -106,7 +106,7 @@ } &__body { &-row { - margin: 0 -20px 80px -20px; + margin: 0 -20px 50px -20px; display: flex; align-items: stretch; flex-wrap: wrap; @@ -146,7 +146,7 @@ display: flex; align-items: center; justify-content: space-between; - margin-bottom: 80px; + margin-bottom: 40px; position: relative; &::before { position: absolute; @@ -196,7 +196,7 @@ &__banner { width: 100%; height: auto; - margin-bottom: 80px; + margin-bottom: 40px; img { width: 100%; } @@ -272,9 +272,9 @@ } // event start .event { - margin: 80px 0; + margin: 50px 0 80px; &__header { - margin-bottom: 80px; + margin-bottom: 40px; display: flex; align-items: center; justify-content: space-between; diff --git a/themes/modern2/assets/css/components/3-page/news.scss b/themes/modern2/assets/css/components/3-page/news.scss index 534eef1ce..f45172ff3 100644 --- a/themes/modern2/assets/css/components/3-page/news.scss +++ b/themes/modern2/assets/css/components/3-page/news.scss @@ -53,7 +53,7 @@ } &__image { width: 100%; - margin: 50px 0; + margin: 25px 0; display: block; img { width: 100%; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 6d4e395bf..6b2482068 100644 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -204,7 +204,7 @@ li { justify-content: space-between; } .footer__copyright { - font-size: 14px-; + font-size: 14px; line-height: 20px; font-weight: 400; color: #ffffff; @@ -245,7 +245,7 @@ li { align-items: center; } .subheader .nav__inner-link { - font-size: 14px-; + font-size: 14px; line-height: 20px; font-weight: 400; color: #ffffff; @@ -283,7 +283,7 @@ li { .subheader .nav__inner-link .dropDown__link { display: block; padding: 15px; - font-size: 14px-; + font-size: 14px; line-height: 20px; font-weight: 400; color: #242424; @@ -587,7 +587,7 @@ li { .card { position: relative; - padding: 30px; + padding: 25px; background: #ffffff; } .card__header { @@ -599,7 +599,7 @@ li { .card__header-category { padding: 5px 10px; background: #fd4c24; - font-size: 14px-; + font-size: 14px; line-height: 20px; color: #ffffff; font-weight: 700; @@ -612,7 +612,7 @@ li { align-items: center; color: #a2a2a2; font-weight: 400; - font-size: 14px-; + font-size: 14px; line-height: 15px; } .card__header-view svg { @@ -624,7 +624,7 @@ li { .card__header-date { display: flex; align-items: center; - font-size: 14px-; + font-size: 12px; line-height: 20px; color: #a2a2a2; font-weight: 400; @@ -636,12 +636,16 @@ li { } .card__link { color: #000; - font-weight: 700; - font-size: 16px; - line-height: 25px; + font-weight: 500; + font-size: 15px; + line-height: 20px; margin: 10px 0 0 0; display: block; - height: 75px; + height: 60px; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; } @@ -802,7 +806,7 @@ li { justify-content: center; align-items: center; font-size: 20px; - line-height: 26px; + line-height: 24px; font-weight: 700; padding: 10px 0; } @@ -818,7 +822,7 @@ li { background-size: contain; background-repeat: no-repeat; font-size: 17px; - line-height: 23px; + line-height: 21px; justify-content: center; align-items: center; cursor: default; @@ -1290,15 +1294,15 @@ li { width: 100%; } -.advertisiment__item { +.rek__item { display: block; } -.advertisiment__item img { +.rek__item img { width: 100%; } .main { - margin-top: 70px; + margin-top: 30px; } .main__inner { display: flex; @@ -1309,7 +1313,7 @@ li { margin-right: 25px; } .main__body-row { - margin: 0 -20px 80px -20px; + margin: 0 -20px 50px -20px; display: flex; align-items: stretch; flex-wrap: wrap; @@ -1352,7 +1356,7 @@ li { display: flex; align-items: center; justify-content: space-between; - margin-bottom: 80px; + margin-bottom: 40px; position: relative; } .main__body-header::before { @@ -1372,13 +1376,13 @@ li { } .main__body-header-title { font-size: 20px; - line-height: 26px; + line-height: 24px; font-weight: 700; color: #242424; background: #ffffff; } .main__body-header-link { - font-size: 14px-; + font-size: 14px; line-height: 20px; font-weight: 400; color: #a2a2a2; @@ -1397,7 +1401,7 @@ li { } .main__body-title { font-size: 20px; - line-height: 26px; + line-height: 24px; font-weight: 700; color: #242424; margin-bottom: 20px; @@ -1405,7 +1409,7 @@ li { .main__banner { width: 100%; height: auto; - margin-bottom: 80px; + margin-bottom: 40px; } .main__banner img { width: 100%; @@ -1419,7 +1423,7 @@ li { } .main__sidebar-title { font-size: 16px; - line-height: 25px; + line-height: 20px; font-weight: 700; text-transform: uppercase; margin-bottom: 80px; @@ -1478,10 +1482,10 @@ li { } .event { - margin: 80px 0; + margin: 50px 0 80px; } .event__header { - margin-bottom: 80px; + margin-bottom: 40px; display: flex; align-items: center; justify-content: space-between; @@ -1489,13 +1493,13 @@ li { } .event__header-title { font-size: 20px; - line-height: 26px; + line-height: 24px; font-weight: 700; color: #242424; background: #ffffff; } .event__header-link { - font-size: 14px-; + font-size: 14px; line-height: 20px; font-weight: 400; color: #a2a2a2; @@ -1580,7 +1584,7 @@ li { } .partner__title { font-size: 20px; - line-height: 26px; + line-height: 24px; font-weight: 700; color: #242424; margin-bottom: 80px; @@ -1605,13 +1609,13 @@ li { font-weight: 700; color: #242424; font-size: 20px; - line-height: 26px; + line-height: 24px; margin-bottom: 80px; } .heading__row { display: flex; align-items: center; - margin-bottom: 80px; + margin-bottom: 40px; } .heading__image { width: 40%; @@ -1644,22 +1648,22 @@ li { animation: reveal 1s ease-out; } .heading__content { - width: calc(60% - 40px); - height: calc(100% - 80px); - padding: 40px 0 40px 40px; + width: calc(60% - 30px); + height: calc(100% - 60px); + padding: 30px 0 30px 30px; } .heading__content-header { display: flex; align-items: center; justify-content: space-between; - margin-bottom: 30px; + margin-bottom: 20px; } .heading__content-header-view { display: flex; align-items: center; color: #a2a2a2; font-weight: 400; - font-size: 14px-; + font-size: 14px; line-height: 15px; } .heading__content-header-view svg { @@ -1670,7 +1674,7 @@ li { .heading__content-header-date { display: flex; align-items: center; - font-size: 14px-; + font-size: 14px; line-height: 20px; color: #ffffff; background: #242424; @@ -1684,17 +1688,17 @@ li { color: #000; font-weight: 700; font-size: 16px; - line-height: 25px; + line-height: 20px; margin: 10px 0 0 0; display: block; - height: 50px; + height: 40px; overflow: hidden; text-overflow: ellipsis; - margin-bottom: 20px; + margin-bottom: 15px; } .heading__content-body-para { font-size: 16px; - line-height: 25px; + line-height: 20px; font-weight: 400; color: #242424; height: 100px; @@ -1726,7 +1730,7 @@ li { .heading__footer-input input { text-align: center; font-size: 20px; - line-height: 26px; + line-height: 24px; height: 100%; width: 100%; border-radius: 5px; @@ -1736,7 +1740,7 @@ li { } .heading__footer span { font-size: 20px; - line-height: 26px; + line-height: 24px; color: #242424; font-weight: 400; margin-left: 10px; @@ -1744,7 +1748,7 @@ li { .address__inner { font-size: 20px; - line-height: 26px; + line-height: 24px; color: #242424; font-weight: 400; margin-bottom: 25px; @@ -1758,23 +1762,23 @@ li { } .about__title { font-size: 22px; - line-height: 30px; + line-height: 28px; font-weight: 700; color: #242424; } .about__para { font-size: 20px; - line-height: 40px; + line-height: 38px; font-weight: 400; color: #242424; - margin-top: 30px; + margin-top: 20px; } .form__title { font-weight: 700; color: #242424; font-size: 20px; - line-height: 26px; + line-height: 24px; margin-bottom: 80px; } .form__row { @@ -1790,7 +1794,7 @@ li { .form__input label { display: block; font-size: 16px; - line-height: 25px; + line-height: 20px; font-weight: 700; color: #242424; margin-bottom: 20px; @@ -1819,7 +1823,7 @@ li { .form__input-bg label { display: block; font-size: 16px; - line-height: 25px; + line-height: 20px; font-weight: 700; color: #242424; margin-bottom: 20px; @@ -1841,7 +1845,7 @@ li { .form__textarea label { display: block; font-size: 16px; - line-height: 25px; + line-height: 20px; font-weight: 700; color: #242424; margin-bottom: 20px; @@ -1861,7 +1865,7 @@ li { padding: 14px; border-radius: 5px; font-size: 16px; - line-height: 25px; + line-height: 20px; margin-top: 30px; } @@ -1880,7 +1884,7 @@ li { } .news__sidebar-title { font-size: 16px; - line-height: 25px; + line-height: 20px; font-weight: 700; text-transform: uppercase; margin-bottom: 20px; @@ -1907,13 +1911,13 @@ li { color: #000; font-weight: 700; font-size: 22px; - line-height: 30px; + line-height: 28px; } .news__date { display: flex; align-items: center; font-size: 20px; - line-height: 26px; + line-height: 24px; color: #a2a2a2; font-weight: 400; margin-bottom: 20px; @@ -1923,7 +1927,7 @@ li { } .news__image { width: 100%; - margin: 50px 0; + margin: 25px 0; display: block; } .news__image img { @@ -1932,7 +1936,7 @@ li { } .news__body p { font-size: 16px; - line-height: 30px; + line-height: 26px; margin-bottom: 20px; } .news__body p img { @@ -1971,7 +1975,7 @@ li { } .news__footer-name { font-size: 22px; - line-height: 30px; + line-height: 28px; font-weight: 700; color: #242424; } @@ -1981,14 +1985,14 @@ li { } .terms__title { font-size: 20px; - line-height: 26px; + line-height: 24px; font-weight: 700; color: #000; margin-bottom: 40px; } .terms__para { font-size: 16px; - line-height: 30px; + line-height: 26px; font-weight: 400; color: #000; margin-bottom: 40px; @@ -2026,7 +2030,7 @@ li { color: #ffffff; font-weight: 400; font-size: 16px; - line-height: 25px; + line-height: 20px; padding: 5px 20px; } .animaSlider__item.slick-active .animaSlider__item-image { @@ -2101,7 +2105,7 @@ li { } .event { - margin: 40px 0; + margin: 40px 0 70px; } .event__header { margin-bottom: 40px; @@ -2387,7 +2391,7 @@ li { margin-right: 0; padding: 20px; font-size: 20px; - line-height: 26px; + line-height: 24px; font-weight: 700; width: calc(100% - 40px); } diff --git a/themes/modern2/assets/css/main.scss b/themes/modern2/assets/css/main.scss index 79b69cbab..07fd72f6d 100644 --- a/themes/modern2/assets/css/main.scss +++ b/themes/modern2/assets/css/main.scss @@ -1,34 +1,34 @@ // 1-main components -@import "./components/1-main/mixin.scss"; -@import "./components/1-main/nulifier.scss"; -@import "./components/1-main/variables.scss"; +@import "components/1-main/mixin"; +@import "components/1-main/nulifier"; +@import "components/1-main/variables"; // 2-layout components -@import "./components/2-layout/header.scss"; -@import "./components/2-layout/footer.scss"; +@import "components/2-layout/header"; +@import "components/2-layout/footer"; + +@import "components/2-layout/subheader"; +@import "../slick/slick"; +@import "../slick/slick-theme"; +@import "components/2-layout/partnerSlider"; +@import "components/2-layout/newsCard"; +@import "components/2-layout/lightpick"; +@import "components/2-layout/newsSlider"; +@import "components/2-layout/swiper"; + -@import "./components/2-layout/subheader.scss"; -@import "../slick/slick.scss"; -@import "../slick/slick-theme.scss"; -@import "./components/2-layout/partnerSlider.scss"; -@import "./components/2-layout/newsCard.scss"; -@import "./components/2-layout/lightpick.scss"; -@import "./components/2-layout/newsSlider.scss"; -@import "./components/2-layout/swiper.scss"; - - // 3-page components -@import "./components/3-page/home.scss"; -@import "./components/3-page/heading.scss"; -@import "./components/3-page/about.scss"; -@import "./components/3-page/contact.scss"; -@import "./components/3-page/news.scss"; -@import "./components/3-page/terms.scss"; +@import "components/3-page/home"; +@import "components/3-page/heading"; +@import "components/3-page/about"; +@import "components/3-page/contact"; +@import "components/3-page/news"; +@import "components/3-page/terms"; -@import "./components/2-layout/slider.scss"; +@import "components/2-layout/slider"; // responsive -@import "./components/2-layout/responsive.scss"; +@import "components/2-layout/responsive"; diff --git a/themes/modern2/assets/css/prepros.config b/themes/modern2/assets/css/prepros.config index a8993a1ca..6795a1a7b 100644 --- a/themes/modern2/assets/css/prepros.config +++ b/themes/modern2/assets/css/prepros.config @@ -213,10 +213,10 @@ }, "dart-sass": { "indentType": "space", - "allowWildcardImports": false, "indentWidth": 2, "linefeed": "lf", - "sourceMap": false + "sourceMap": false, + "allowWildcardImports": false }, "haml": { "doubleQuoteAttributes": true @@ -301,7 +301,6 @@ "properties": true, "pure_funcs": [], "pure_getters": false, - "reduce_funcs": true, "reduce_vars": true, "sequences": true, "side_effects": true, @@ -316,7 +315,8 @@ "unsafe_proto": false, "unsafe_regexp": false, "unsafe_undefined": false, - "unused": true + "unused": true, + "reduce_funcs": true }, "mangle": { "eval": false, @@ -347,13 +347,13 @@ }, "node-sass": { "indentType": "space", - "allowWildcardImports": false, "indentWidth": 2, "linefeed": "lf", "outputStyle": "expanded", "precision": 10, "sourceMap": false, - "sourceComments": false + "sourceComments": false, + "allowWildcardImports": false }, "png": { "quality": 90 diff --git a/themes/modern2/assets/css/style.css b/themes/modern2/assets/css/style.css index 2417e6bf8..4839aef8b 100644 --- a/themes/modern2/assets/css/style.css +++ b/themes/modern2/assets/css/style.css @@ -116,14 +116,7 @@ body { /* ========================================== */ -.slick-slide img { - display: block; - width: 100%; -} -.swiper-slide-content { - width: 100% !important; -} .right_top-title-text-2 { width: 9.4rem;