From 16a2025ee75fb9b656404afdb566ab32d8069baa Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:04:29 +0500 Subject: [PATCH 01/14] 123 --- .../css/components/2-layout/header.scss | 129 +++++++++--------- .../css/components/2-layout/responsive.scss | 68 +++++++++ .../css/components/2-layout/swiper.scss | 12 +- .../assets/css/components/3-page/home.scss | 1 + themes/modern2/assets/css/main.css | 84 ++++++++++++ themes/modern2/assets/js/menu.js | 16 ++- themes/modern2/pages/index.htm | 42 +++++- themes/modern2/partials/header.htm | 48 +++++-- themes/modern2/partials/slider.htm | 8 +- 9 files changed, 325 insertions(+), 83 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/header.scss b/themes/modern2/assets/css/components/2-layout/header.scss index be4f25c79..50a29ec12 100755 --- a/themes/modern2/assets/css/components/2-layout/header.scss +++ b/themes/modern2/assets/css/components/2-layout/header.scss @@ -1,68 +1,71 @@ .header { - position: relative; - &::before { - position: absolute; - content: ""; - top: 0; - left: 0; - width: 100%; - height: 4px; - background: #00822c; - } - &__inner { - display: flex; - align-items: center; - justify-content: space-between; - padding: 20px 0; - } - &__logo { - width: 120px; - } - &__search { - display: flex; - align-items: center; - &-input { - width: 350px; - position: relative; - input { - width: calc(100% - 60px); - font-family: "roboto"; - padding: 14px 40px 14px 20px; - font-size: $h4-size; - line-height: $h4-size; - color: rgba($color: $text-light-black, $alpha: 0.3); - border-radius: 5px; - border: 1px solid #c9c9c9; - &::placeholder { - font-family: "roboto"; - font-size: $h4-size; - line-height: $h4-size; - color: rgba($color: $text-light-black, $alpha: 0.3); + position: relative; + .mobileSearch { + display: none; + } + &::before { + position: absolute; + content: ""; + top: 0; + left: 0; + width: 100%; + height: 4px; + background: #00822c; + } + &__inner { + display: flex; + align-items: center; + justify-content: space-between; + padding: 20px 0; + } + &__logo { + width: 120px; + } + &__search { + display: flex; + align-items: center; + &-input { + width: 350px; + position: relative; + input { + width: calc(100% - 60px); + font-family: "roboto"; + padding: 14px 40px 14px 20px; + font-size: $h4-size; + line-height: $h4-size; + color: rgba($color: $text-light-black, $alpha: 0.3); + border-radius: 5px; + border: 1px solid #c9c9c9; + &::placeholder { + font-family: "roboto"; + font-size: $h4-size; + line-height: $h4-size; + color: rgba($color: $text-light-black, $alpha: 0.3); + } + } + } + &-btn { + position: absolute; + top: 50%; + right: 20px; + @include transformY; + svg { + width: 18px; + height: 18px; + fill: $text-light-black; + } } - } } - &-btn { - position: absolute; - top: 50%; - right: 20px; - @include transformY; - svg { - width: 18px; - height: 18px; - fill: $text-light-black; - } + &__slogan { + font-family: "Oswald", sans-serif; + color: $main-color; + font-weight: 700; + font-size: 40px; + line-height: 40px; + margin-right: 20px; + letter-spacing: -1.5px; + } + .hamBtn { + display: none; } - } - &__slogan { - font-family: "Oswald", sans-serif; - color: $main-color; - font-weight: 700; - font-size: 40px; - line-height: 40px; - margin-right: 20px; - letter-spacing: -1.5px; - } - .hamBtn { - display: none; - } } diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index 64fc884f5..1775a9674 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -225,11 +225,69 @@ margin: 0; } } + .search { + &Modal { + position: fixed; + z-index: 1000; + top: 0; + left: 0; + transform: translateY(-100%); + -webkit-transform: translateY(-100%); + -moz-transform: translateY(-100%); + -ms-transform: translateY(-100%); + -o-transform: translateY(-100%); + background: #fff; + width: 100%; + height: 100%; + &__inner { + padding: 50px; + } + &.active { + transform: translateY(0); + -webkit-transform: translateY(0); + -moz-transform: translateY(0); + -ms-transform: translateY(0); + -o-transform: translateY(0); + } + &Input { + position: relative; + input { + width: calc(100% - 60px); + height: 50px; + padding: 0 40px 0 20px; + display: flex; + align-items: center; + font-size: 14px; + line-height: 1; + font-weight: 500; + color: $text-black; + } + } + } + &Logo { + width: 100%; + max-width: 160px; + margin: 30px auto; + } + &Close { + width: 24px; + height: 24px; + fill: #b4b4b4; + } + } .header { border-bottom: 4px solid #242424; &__slogan { display: none; } + .mobileSearch { + display: block; + svg { + width: 22px; + height: 22px; + fill: #b4b4b4; + } + } &__search { display: none; } @@ -296,6 +354,16 @@ &::before { display: none; } + .dropDown { + position: unset; + width: unset; + background: unset; + &__link { + color: $text-color-white; + text-align: center; + padding: 20px 0; + } + } } } } diff --git a/themes/modern2/assets/css/components/2-layout/swiper.scss b/themes/modern2/assets/css/components/2-layout/swiper.scss index 22da993c5..4f2447a7c 100755 --- a/themes/modern2/assets/css/components/2-layout/swiper.scss +++ b/themes/modern2/assets/css/components/2-layout/swiper.scss @@ -43,7 +43,7 @@ /* Center slide t ext vertically */ display: -webkit-box; display: -ms-flexbox; - display: -webkit-flex; + display: -webkit-flex; display: flex; -webkit-box-pack: center; -ms-flex-pack: center; @@ -61,6 +61,16 @@ position: absolute; transform-origin: 0% 50%; position: relative; + picture { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + img { + @include fullImage; + } + } } &-content { position: absolute; diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 1687464d3..14c188714 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -315,6 +315,7 @@ width: calc(50% - 40px); margin: 0 20px; position: relative; + cursor: pointer; a.progressive { position: relative; display: block; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index f23d5b228..009840133 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -117,6 +117,9 @@ li { .header { position: relative; } +.header .mobileSearch { + display: none; +} .header::before { position: absolute; content: ""; @@ -1098,6 +1101,19 @@ li { transform-origin: 0% 50%; position: relative; } +.swiper-slide-image picture { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.swiper-slide-image picture img { + width: 100%; + height: 100%; + object-fit: cover; + -o-object-fit: cover; +} .swiper-slide-content { position: absolute; left: 0; @@ -1504,6 +1520,7 @@ li { width: calc(50% - 40px); margin: 0 20px; position: relative; + cursor: pointer; } .event__body-image a.progressive { position: relative; @@ -2213,12 +2230,69 @@ li { margin: 0; } + .searchModal { + position: fixed; + z-index: 1000; + top: 0; + left: 0; + transform: translateY(-100%); + -webkit-transform: translateY(-100%); + -moz-transform: translateY(-100%); + -ms-transform: translateY(-100%); + -o-transform: translateY(-100%); + background: #fff; + width: 100%; + height: 100%; + } + .searchModal__inner { + padding: 50px; + } + .searchModal.active { + transform: translateY(0); + -webkit-transform: translateY(0); + -moz-transform: translateY(0); + -ms-transform: translateY(0); + -o-transform: translateY(0); + } + .searchModalInput { + position: relative; + } + .searchModalInput input { + width: calc(100% - 60px); + height: 50px; + padding: 0 40px 0 20px; + display: flex; + align-items: center; + font-size: 14px; + line-height: 1; + font-weight: 500; + color: #000; + } + .searchLogo { + width: 100%; + max-width: 160px; + margin: 30px auto; + } + .searchClose { + width: 24px; + height: 24px; + fill: #b4b4b4; + } + .header { border-bottom: 4px solid #242424; } .header__slogan { display: none; } + .header .mobileSearch { + display: block; + } + .header .mobileSearch svg { + width: 22px; + height: 22px; + fill: #b4b4b4; + } .header__search { display: none; } @@ -2288,6 +2362,16 @@ li { .subheader__inner .nav__inner-link::before { display: none; } + .subheader__inner .nav__inner-link .dropDown { + position: unset; + width: unset; + background: unset; + } + .subheader__inner .nav__inner-link .dropDown__link { + color: #ffffff; + text-align: center; + padding: 20px 0; + } .subheader__inner .language { position: absolute; bottom: 0; diff --git a/themes/modern2/assets/js/menu.js b/themes/modern2/assets/js/menu.js index bafe612ff..f93450f07 100644 --- a/themes/modern2/assets/js/menu.js +++ b/themes/modern2/assets/js/menu.js @@ -3,8 +3,20 @@ var menu = document.getElementById("menu"); var menuBtn = document.getElementById("menuBtn"); var closeMenu = document.getElementById("closeMenu"); menuBtn.onclick = function () { - menu.classList.add("showMenu"); + menu.classList.add("showMenu"); }; closeMenu.onclick = function () { - menu.classList.remove("showMenu"); + menu.classList.remove("showMenu"); +}; + + + +var searchModal = document.getElementById("searchModal"); +var searchBtn = document.getElementById("menuBtn"); +var searchClose = document.getElementById("searchClose"); +searchBtn.onclick = function () { + searchModal.classList.add("active"); +}; +searchClose.onclick = function () { + searchModal.classList.remove("active"); }; diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm index 03d927196..2369d77fb 100644 --- a/themes/modern2/pages/index.htm +++ b/themes/modern2/pages/index.htm @@ -125,5 +125,45 @@ random = 0 +
+
+
+ + + + + + + +
+ +
+
+ + +
+
+
+
+================================================ --> \ No newline at end of file diff --git a/themes/modern2/partials/header.htm b/themes/modern2/partials/header.htm index ec13813df..8c6db76f1 100644 --- a/themes/modern2/partials/header.htm +++ b/themes/modern2/partials/header.htm @@ -8,6 +8,28 @@ code = "top-menu"
+
+ + + + + + + + + + + + + +
@@ -20,14 +42,14 @@ code = "top-menu" @@ -65,8 +87,10 @@ code = "top-menu" {% endfor %}
- {% elseif not item.viewBag.isHidden %} - {{ item.title }} + {% elseif not item.viewBag.isHidden %} + {{ + item.title }} {% endif %} {% endfor %} @@ -74,12 +98,12 @@ code = "top-menu"
{{ form_open({ request:'onSwitchLocale'})}} - - - - + + + @@ -89,4 +113,4 @@ code = "top-menu"
+================================================--> \ No newline at end of file diff --git a/themes/modern2/partials/slider.htm b/themes/modern2/partials/slider.htm index db74436c2..069db8ef2 100644 --- a/themes/modern2/partials/slider.htm +++ b/themes/modern2/partials/slider.htm @@ -26,10 +26,10 @@ postPage = "post" {% for post in posts.slice(0,3) %}
-
+
+ + +
diff --git a/themes/modern2/partials/header.htm b/themes/modern2/partials/header.htm index ec13813df..abdd305e5 100644 --- a/themes/modern2/partials/header.htm +++ b/themes/modern2/partials/header.htm @@ -2,7 +2,15 @@ [staticMenu] code = "top-menu" + +[adverts] +code = "samsung" +type = "single" +random = 0 == +
+ {% component 'adverts'%} +
@@ -89,4 +97,4 @@ code = "top-menu" +================================================--> \ No newline at end of file From 6813c3b0be1b17c0265ff6ec3a2a191e49d0d267 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:11:11 +0500 Subject: [PATCH 03/14] 123 --- themes/modern2/partials/slider.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/modern2/partials/slider.htm b/themes/modern2/partials/slider.htm index 069db8ef2..a249ee2af 100644 --- a/themes/modern2/partials/slider.htm +++ b/themes/modern2/partials/slider.htm @@ -28,7 +28,7 @@ postPage = "post"
- +
+ \ No newline at end of file From b47eb3fc345b4762efcc689cfa2e837c56b0427d Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:14:53 +0500 Subject: [PATCH 05/14] 1234 --- themes/modern2/assets/js/menu.js | 12 +++++++++--- themes/modern2/pages/index.htm | 12 +----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/themes/modern2/assets/js/menu.js b/themes/modern2/assets/js/menu.js index 439ec6258..68429c789 100644 --- a/themes/modern2/assets/js/menu.js +++ b/themes/modern2/assets/js/menu.js @@ -9,6 +9,12 @@ closeMenu.onclick = function () { menu.classList.remove("showMenu"); }; - - - +var searchModal = document.getElementById("searchModal"); +var searchBtn = document.getElementById("searchBtn"); +var searchClose = document.getElementById("searchClose"); +searchBtn.onclick = function () { + searchModal.classList.add("active"); +}; +searchClose.onclick = function () { + searchModal.classList.remove("active"); +}; diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm index 03fc5325e..ff8f45005 100644 --- a/themes/modern2/pages/index.htm +++ b/themes/modern2/pages/index.htm @@ -180,16 +180,6 @@ random = 0
- + \ No newline at end of file From ffab408c7537454869ce38b80eba4764a02048f6 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:20:13 +0500 Subject: [PATCH 06/14] 123 --- .../css/components/2-layout/responsive.scss | 22 +++++++++++++++++- themes/modern2/assets/css/main.css | 23 ++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index 1775a9674..b25e8d6ec 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -240,7 +240,7 @@ width: 100%; height: 100%; &__inner { - padding: 50px; + padding: 25px; } &.active { transform: translateY(0); @@ -261,6 +261,23 @@ line-height: 1; font-weight: 500; color: $text-black; + border-radius: 5px; + border: 1px solid #242424; + } + &__btn { + position: absolute; + right: 15px; + top: 50%; + transform: translateY(-50%); + -webkit-transform: translateY(-50%); + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -o-transform: translateY(-50%); + svg { + width: 24px; + height: 24px; + fill: #242424; + } } } } @@ -453,6 +470,9 @@ } } @include sm-md { + .newsSlider__outer { + display: none; + } .swiper-container { .slick-list { padding: 0 0 0 0; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 009840133..36fd79627 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -2245,7 +2245,7 @@ li { height: 100%; } .searchModal__inner { - padding: 50px; + padding: 25px; } .searchModal.active { transform: translateY(0); @@ -2267,6 +2267,23 @@ li { line-height: 1; font-weight: 500; color: #000; + border-radius: 5px; + border: 1px solid #242424; + } + .searchModalInput__btn { + position: absolute; + right: 15px; + top: 50%; + transform: translateY(-50%); + -webkit-transform: translateY(-50%); + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -o-transform: translateY(-50%); + } + .searchModalInput__btn svg { + width: 24px; + height: 24px; + fill: #242424; } .searchLogo { width: 100%; @@ -2452,6 +2469,10 @@ li { } } @media (max-width: 700px) { + .newsSlider__outer { + display: none; + } + .swiper-container .slick-list { padding: 0 0 0 0; } From 71096f009c60e0af7e7dfede7a3c84f5cc4a81e5 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:20:41 +0500 Subject: [PATCH 07/14] 1234 --- themes/modern2/assets/css/components/2-layout/responsive.scss | 1 + themes/modern2/assets/css/main.css | 2 ++ 2 files changed, 3 insertions(+) diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index b25e8d6ec..f58f33478 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -227,6 +227,7 @@ } .search { &Modal { + @include transition; position: fixed; z-index: 1000; top: 0; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 36fd79627..c4f2e0f84 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -2231,6 +2231,8 @@ li { } .searchModal { + transition: all 0.2s ease-in-out 0s; + -moz-transition: all 0.2s ease-in-out 0s; position: fixed; z-index: 1000; top: 0; From b5d4d4644c6e34869c461b6719bba81ccbbdeb12 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:22:56 +0500 Subject: [PATCH 08/14] 123 --- .../css/components/2-layout/responsive.scss | 1 + themes/modern2/assets/css/main.css | 1 + themes/modern2/pages/index.htm | 30 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index f58f33478..3035935dc 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -268,6 +268,7 @@ &__btn { position: absolute; right: 15px; + background: none; top: 50%; transform: translateY(-50%); -webkit-transform: translateY(-50%); diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index c4f2e0f84..90d350c15 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -2275,6 +2275,7 @@ li { .searchModalInput__btn { position: absolute; right: 15px; + background: none; top: 50%; transform: translateY(-50%); -webkit-transform: translateY(-50%); diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm index 9368fc36e..8b54a673d 100644 --- a/themes/modern2/pages/index.htm +++ b/themes/modern2/pages/index.htm @@ -162,22 +162,20 @@ random = 0 -
-
- - -
-
+
+ + +
From 40e5e8188f9c72bc21328326cbf64d5de7c9a6b9 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:25:23 +0500 Subject: [PATCH 09/14] 1234 --- .../css/components/2-layout/responsive.scss | 60 +++++++++---------- themes/modern2/assets/css/main.css | 8 +-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index 3035935dc..a68f81306 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -250,36 +250,36 @@ -ms-transform: translateY(0); -o-transform: translateY(0); } - &Input { - position: relative; - input { - width: calc(100% - 60px); - height: 50px; - padding: 0 40px 0 20px; - display: flex; - align-items: center; - font-size: 14px; - line-height: 1; - font-weight: 500; - color: $text-black; - border-radius: 5px; - border: 1px solid #242424; - } - &__btn { - position: absolute; - right: 15px; - background: none; - top: 50%; - transform: translateY(-50%); - -webkit-transform: translateY(-50%); - -moz-transform: translateY(-50%); - -ms-transform: translateY(-50%); - -o-transform: translateY(-50%); - svg { - width: 24px; - height: 24px; - fill: #242424; - } + } + &Input { + position: relative; + input { + width: calc(100% - 60px); + height: 50px; + padding: 0 40px 0 20px; + display: flex; + align-items: center; + font-size: 14px; + line-height: 1; + font-weight: 500; + color: $text-black; + border-radius: 5px; + border: 1px solid #242424; + } + &__btn { + position: absolute; + right: 15px; + background: none; + top: 50%; + transform: translateY(-50%); + -webkit-transform: translateY(-50%); + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -o-transform: translateY(-50%); + svg { + width: 24px; + height: 24px; + fill: #242424; } } } diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 90d350c15..7520cdbe1 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -2256,10 +2256,10 @@ li { -ms-transform: translateY(0); -o-transform: translateY(0); } - .searchModalInput { + .searchInput { position: relative; } - .searchModalInput input { + .searchInput input { width: calc(100% - 60px); height: 50px; padding: 0 40px 0 20px; @@ -2272,7 +2272,7 @@ li { border-radius: 5px; border: 1px solid #242424; } - .searchModalInput__btn { + .searchInput__btn { position: absolute; right: 15px; background: none; @@ -2283,7 +2283,7 @@ li { -ms-transform: translateY(-50%); -o-transform: translateY(-50%); } - .searchModalInput__btn svg { + .searchInput__btn svg { width: 24px; height: 24px; fill: #242424; From dcbf04bec953e1383db77011e29ddbd707201d00 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:29:10 +0500 Subject: [PATCH 10/14] 123 --- .../modern2/assets/css/components/2-layout/responsive.scss | 5 +++++ themes/modern2/assets/css/main.css | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index a68f81306..2a17333f2 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -374,13 +374,18 @@ display: none; } .dropDown { + margin-top: 20px; position: unset; width: unset; background: unset; + background: #b4b4b4; &__link { color: $text-color-white; text-align: center; padding: 20px 0; + &:hover { + background: unset; + } } } } diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 7520cdbe1..70414d84f 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -2383,15 +2383,20 @@ li { display: none; } .subheader__inner .nav__inner-link .dropDown { + margin-top: 20px; position: unset; width: unset; background: unset; + background: #b4b4b4; } .subheader__inner .nav__inner-link .dropDown__link { color: #ffffff; text-align: center; padding: 20px 0; } + .subheader__inner .nav__inner-link .dropDown__link:hover { + background: unset; + } .subheader__inner .language { position: absolute; bottom: 0; From dcd453932efe97ca923222f86e7817ba0f77af44 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:32:38 +0500 Subject: [PATCH 11/14] 123 --- themes/modern2/assets/css/components/2-layout/responsive.scss | 2 ++ themes/modern2/assets/css/main.css | 2 ++ 2 files changed, 4 insertions(+) diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index 2a17333f2..2805662dd 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -253,6 +253,8 @@ } &Input { position: relative; + max-width: 450px; + margin: 0 auto; input { width: calc(100% - 60px); height: 50px; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 70414d84f..38413f249 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -2258,6 +2258,8 @@ li { } .searchInput { position: relative; + max-width: 450px; + margin: 0 auto; } .searchInput input { width: calc(100% - 60px); From 2698fc22b266c6f1aa8cb0abe2ec891a17e5286d Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:37:23 +0500 Subject: [PATCH 12/14] 123 --- .../css/components/2-layout/header.scss | 3 ++ .../css/components/2-layout/responsive.scss | 1 + themes/modern2/assets/css/main.css | 5 +++ themes/modern2/pages/index.htm | 39 +---------------- themes/modern2/partials/header.htm | 42 ++++++++++++++++++- 5 files changed, 50 insertions(+), 40 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/header.scss b/themes/modern2/assets/css/components/2-layout/header.scss index 50a29ec12..0eade9eaf 100755 --- a/themes/modern2/assets/css/components/2-layout/header.scss +++ b/themes/modern2/assets/css/components/2-layout/header.scss @@ -69,3 +69,6 @@ display: none; } } +.mobileSearch { + display: block; +} diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index 2805662dd..3bee19117 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -227,6 +227,7 @@ } .search { &Modal { + display: block; @include transition; position: fixed; z-index: 1000; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 38413f249..4665f7a92 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -190,6 +190,10 @@ li { display: none; } +.mobileSearch { + display: block; +} + .footer { background: #242424; padding: 30px 0; @@ -2231,6 +2235,7 @@ li { } .searchModal { + display: block; transition: all 0.2s ease-in-out 0s; -moz-transition: all 0.2s ease-in-out 0s; position: fixed; diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm index 8b54a673d..c82428898 100644 --- a/themes/modern2/pages/index.htm +++ b/themes/modern2/pages/index.htm @@ -140,44 +140,7 @@ random = 0 -
-
-
- - - - - - - -
- -
- - -
-
-
+ \ No newline at end of file diff --git a/themes/modern2/partials/header.htm b/themes/modern2/partials/header.htm index 739ed0958..560055a4b 100644 --- a/themes/modern2/partials/header.htm +++ b/themes/modern2/partials/header.htm @@ -9,8 +9,8 @@ type = "single" random = 0 ==
- {% component 'adverts'%} -
+ {% component 'adverts'%} +
@@ -72,6 +72,44 @@ random = 0 +
+
+
+ + + + + + + +
+ +
+ + +
+
+
From 14a6d216b0b44d1801eaf90b91604d10fdae9b85 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 2 Jun 2021 16:39:13 +0500 Subject: [PATCH 13/14] 12345 --- themes/modern2/assets/css/components/2-layout/header.scss | 4 ++-- themes/modern2/assets/css/main.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/header.scss b/themes/modern2/assets/css/components/2-layout/header.scss index 0eade9eaf..1fe5e3af1 100755 --- a/themes/modern2/assets/css/components/2-layout/header.scss +++ b/themes/modern2/assets/css/components/2-layout/header.scss @@ -69,6 +69,6 @@ display: none; } } -.mobileSearch { - display: block; +.searchModal { + display: none; } diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 4665f7a92..3e87d1d97 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -190,8 +190,8 @@ li { display: none; } -.mobileSearch { - display: block; +.searchModal { + display: none; } .footer { From 4cd0836948357a7696cc60a8cbd96c3dcb026948 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 4 Jun 2021 12:38:17 +0000 Subject: [PATCH 14/14] server --- plugins/tps/reklama/components/advertisement/carousel.htm | 2 ++ themes/modern2/pages/post.htm | 5 ++++- themes/modern2/partials/index/category_posts.htm | 6 +++--- themes/modern2/partials/index/top_section.htm | 6 +++--- themes/modern2/partials/slider.htm | 6 +++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/plugins/tps/reklama/components/advertisement/carousel.htm b/plugins/tps/reklama/components/advertisement/carousel.htm index 977fd0393..88fed663e 100644 --- a/plugins/tps/reklama/components/advertisement/carousel.htm +++ b/plugins/tps/reklama/components/advertisement/carousel.htm @@ -36,6 +36,7 @@ dots: false, infinite: true, speed: 300, + autoplay: true, slidesToShow: 5, arrows: true, prevArrow: $(".p1"), @@ -81,6 +82,7 @@ speed: 300, slidesToShow: 5, arrows: true, + autoplay: true, prevArrow: $(".p1"), nextArrow: $(".n1"), slidesToScroll: 1, diff --git a/themes/modern2/pages/post.htm b/themes/modern2/pages/post.htm index 2ac977f26..f80ace584 100644 --- a/themes/modern2/pages/post.htm +++ b/themes/modern2/pages/post.htm @@ -49,7 +49,10 @@ post = "post" {% if post.featured_image %} - {{post.title}} + + + + {{post.title}} {% endif %}
diff --git a/themes/modern2/partials/index/category_posts.htm b/themes/modern2/partials/index/category_posts.htm index a71e53694..46bc9a753 100644 --- a/themes/modern2/partials/index/category_posts.htm +++ b/themes/modern2/partials/index/category_posts.htm @@ -10,8 +10,8 @@ {{'page.more'|_}} - - {{posts.first.title}} + + {{posts.first.title}}
@@ -37,4 +37,4 @@ {% partial 'index/category_post_item' post = posts[1] %} {% partial 'index/category_post_item' post = posts.last %}
-
+ \ No newline at end of file diff --git a/themes/modern2/partials/index/top_section.htm b/themes/modern2/partials/index/top_section.htm index 8e5040658..484877540 100644 --- a/themes/modern2/partials/index/top_section.htm +++ b/themes/modern2/partials/index/top_section.htm @@ -14,8 +14,8 @@
- - {{firstPost.title}} + + {{firstPost.title}}
{% partial 'index/post_item' post = firstPost category = category %} @@ -29,4 +29,4 @@
- + \ No newline at end of file diff --git a/themes/modern2/partials/slider.htm b/themes/modern2/partials/slider.htm index a249ee2af..53ee90584 100644 --- a/themes/modern2/partials/slider.htm +++ b/themes/modern2/partials/slider.htm @@ -28,7 +28,7 @@ postPage = "post"
- +