diff --git a/themes/berkarar/assets/css/components/1-main/nulifier.scss b/themes/berkarar/assets/css/components/1-main/nulifier.scss index e77efe7..250c10a 100755 --- a/themes/berkarar/assets/css/components/1-main/nulifier.scss +++ b/themes/berkarar/assets/css/components/1-main/nulifier.scss @@ -47,6 +47,10 @@ body { &.active { overflow: hidden; } + + display: flex; + flex-direction: column; + min-height: 100vh; } body.active { diff --git a/themes/berkarar/assets/css/components/2-layout/footer.scss b/themes/berkarar/assets/css/components/2-layout/footer.scss index c4c80ea..e595575 100755 --- a/themes/berkarar/assets/css/components/2-layout/footer.scss +++ b/themes/berkarar/assets/css/components/2-layout/footer.scss @@ -1,6 +1,7 @@ // Footer ===================== .footer { padding: 80px 0; + margin: auto 0 0 0; background: $gray; &_box { @@ -20,7 +21,7 @@ right: -40px; height: 100%; width: 1px; - background: #fff; + background: #8E8E8E; } &:last-child { @@ -66,7 +67,7 @@ &_navs { display: flex; justify-content: space-between; - border-top: 1px solid #fff; + border-top: 1px solid #8E8E8E; margin-top: 50px; padding-top: 50px; @@ -85,7 +86,7 @@ } p { - font-size: 12px; + font-size: 16px; font-weight: 400; line-height: 1.3; color: #fff; @@ -105,8 +106,8 @@ span { display: block; - width: 16px; - height: 16px; + width: 20px; + height: 20px; margin-right: 10px; svg { @@ -123,7 +124,7 @@ } .copyright { - font-size: 12px; + font-size: 16px; font-weight: 700; line-height: 1.3; margin-bottom: 24px; @@ -139,7 +140,7 @@ } a { - font-size: 12px; + font-size: 16px; font-weight: 400; line-height: 1.3; color: #fff; @@ -158,8 +159,8 @@ span { display: block; - width: 16px; - height: 16px; + width: 20px; + height: 20px; margin-right: 10px; svg { diff --git a/themes/berkarar/assets/css/components/2-layout/header.scss b/themes/berkarar/assets/css/components/2-layout/header.scss index 96f2642..8fa54c7 100755 --- a/themes/berkarar/assets/css/components/2-layout/header.scss +++ b/themes/berkarar/assets/css/components/2-layout/header.scss @@ -8,7 +8,7 @@ position: relative; top: 0; - &.active { + &.fixed { position: fixed; top: 0; left: 0; @@ -189,7 +189,7 @@ align-items: center; justify-content: center; cursor: pointer; - padding: 12px 15px; + padding: 15px 12px; background: #fff; border-radius: 10px; @@ -365,7 +365,7 @@ padding: 20px 0; background: $black; - &.active { + &.fixed { position: fixed; top: 110px; left: 0; @@ -394,7 +394,8 @@ // margin-right: 0; // } - a { + a, + h6 { font-weight: 700; font-size: 12px; line-height: 15px; @@ -545,10 +546,6 @@ margin-bottom: 20px; } - .mobile_buttons { - display: none; - } - &::-webkit-scrollbar { display: none; } @@ -619,7 +616,7 @@ } &_col { - width: calc(20% - 80px); + width: calc(20% - 64px); margin-right: 80px; position: relative; display: block; @@ -631,7 +628,7 @@ right: -40px; height: 100%; width: 1px; - background: #fff; + background: #8E8E8E; } &:last-child { @@ -652,7 +649,7 @@ &-title { font-weight: 700; - font-size: 14px; + font-size: 16px; line-height: 1.2; color: $yellow; margin-bottom: 25px; @@ -662,7 +659,7 @@ display: block; margin-bottom: 20px; font-weight: 700; - font-size: 14px; + font-size: 16px; line-height: 1.2; color: #FFFFFF; @include transition; @@ -738,69 +735,4 @@ } } -// Menu end =================== - -// Mobile ==================== -.mobile { - &_navs { - display: flex; - justify-content: space-between; - margin-bottom: 70px; - - &-list { - width: calc(50% - 50px); - background: #292929; - padding: 20px; - border-radius: 5px; - - display: flex; - flex-wrap: wrap; - - li { - margin: 0 30px 20px 0; - } - - a { - font-size: 13px; - font-weight: 400; - line-height: 1.3; - color: #fff; - text-transform: uppercase; - } - } - } - - &_profile { - background: #292929; - width: calc(50% - 50px); - padding: 20px; - border-radius: 5px; - - // display: flex; - // flex-wrap: wrap; - - &-title { - width: 100%; - color: #FFF; - font-size: 13px; - font-weight: 700; - line-height: 1.3; - padding-bottom: 15px; - margin-bottom: 25px; - border-bottom: 1px solid #fff; - text-align: center; - } - - &-link { - text-align: center; - color: #FFF; - font-size: 13px; - font-weight: 400; - line-height: 1.3; - display: block; - margin-bottom: 25px; - } - } -} - -// Mobile end ================ \ No newline at end of file +// Menu end =================== \ No newline at end of file diff --git a/themes/berkarar/assets/css/components/2-layout/responsive.scss b/themes/berkarar/assets/css/components/2-layout/responsive.scss index 12dbdb6..e143fa7 100755 --- a/themes/berkarar/assets/css/components/2-layout/responsive.scss +++ b/themes/berkarar/assets/css/components/2-layout/responsive.scss @@ -55,11 +55,6 @@ height: 40px; } - .burger { - width: 40px; - height: 40px; - } - .lang { &_current { padding: 10px; @@ -504,6 +499,25 @@ padding: 0 20px; } + // Menu ======================= + .menu { + &_box { + flex-wrap: wrap; + } + + &_col { + width: calc(33.33% - 80px); + + &:nth-child(3) { + &::after { + display: none; + } + } + } + } + + // Menu end =================== + // Restaurants ================ .rest { &.page { @@ -652,55 +666,10 @@ .menu { &.active { top: 90px; - height: calc(100% - 90px); + height: calc(100% - 89px); } .mobile { - &_buttons { - display: block; - margin-bottom: 25px; - - .row { - display: flex; - align-items: center; - justify-content: space-around; - padding: 20px; - background: $black; - border-radius: 5px; - } - - &-link { - font-weight: 700; - font-size: 18px; - line-height: 1.4; - color: #fff; - margin-right: 10px; - display: block; - - &:last-child { - margin-right: 0; - } - - a { - font-weight: 700; - font-size: 18px; - line-height: 1.4; - color: #fff; - margin-right: 10px; - display: block; - margin: 40px 0 0 0; - - display: none; - - &.active { - display: block; - } - } - } - - - } - &_user { &-link { width: calc(100% - 40px); @@ -785,35 +754,6 @@ // Menu end ================ - // Mobile ==================== - .mobile { - &_navs { - flex-direction: column; - - &-list { - width: calc(100% - 40px); - margin-bottom: 25px; - } - } - - &_profile { - width: calc(100% - 40px); - - &-title { - font-size: 16px; - margin-bottom: 30px; - padding-bottom: 15px; - } - - &-link { - font-size: 16px; - margin-bottom: 15px; - } - } - } - - // Mobile end ================ - // Shops ====================== .shops { &_item { @@ -876,6 +816,23 @@ // Footer end ================== + // 404 ====================== + .error { + padding: 50px 0; + + &_icon { + display: none; + } + + &_info { + align-items: center; + text-align: center; + width: 100%; + } + } + + // 404 end ================== + } @@ -885,14 +842,6 @@ // Menu ==================== .menu { - .mobile_buttons { - justify-content: space-between; - - &-link { - font-size: 18px; - } - } - &_search { padding-top: 30px; @@ -1125,25 +1074,81 @@ width: calc(100% - 210px); height: 35px; } + + .burger { + height: 32px; + border-radius: 50%; + + span { + margin-right: 0; + } + + p { + display: none; + } + } } // Header end ============ // Menu ================ .menu { - .mobile_buttons { - .row { - justify-content: center; - flex-wrap: wrap; - align-items: unset; - padding: 20px 30px; + &_col { + margin: 0; + width: 100%; + + &:last-child { + margin-bottom: 0; + } + + &:nth-child(3) { + margin-right: 0; + + &::after { + content: none; + } + } + + &::after { + content: none; + } + + &-group { + margin-bottom: 15px; + + &:last-child { + margin-bottom: 15px; + } + } + + &-title { + font-size: 18px; + } + + &-box { + overflow: hidden; + max-height: 0; + @include transition; + + &::-webkit-scrollbar { + display: none; + } } &-link { - font-size: 16px; - width: calc(50% - 20px); - margin: 15px 10px; - text-align: center; + position: relative; + padding-left: 50px; + + &::before { + content: ''; + position: absolute; + top: 50%; + left: 20px; + @include transformY; + width: 10px; + height: 10px; + background: url("../images/svg/nav_link-arrow.png") no-repeat center; + } } } @@ -1151,6 +1156,7 @@ &_navs { margin-top: 30px; padding-top: 30px; + padding-bottom: 20px; } } } @@ -1617,6 +1623,27 @@ } // Result end ============= + + // 404 ====================== + .error { + &_sup-title { + font-size: 60px; + } + + &_title { + font-size: 22px; + } + + &_txt { + font-size: 14px; + } + + &_link { + font-size: 14px; + } + } + + // 404 end ================== } // 520 ========================================== @@ -1630,6 +1657,19 @@ .header { padding: 25px 0; + .burger { + height: 28px; + + span { + width: 20px; + + &::before, + &::after { + width: 20px; + } + } + } + .lang { &_current { padding: 8px; @@ -1648,11 +1688,6 @@ .logo { width: calc(100% - 160px); } - - .burger { - width: 36px; - height: 36px; - } } // Header end ============ @@ -1664,25 +1699,13 @@ height: calc(100% - 85px); } - .mobile { - &_buttons { - background: none; - - .row { - background: none; - padding: 0; - } - - &-link { - flex-direction: column; - width: calc(100% - 30px); - margin: 0 0 15px; - padding: 20px 15px; - background: #171717; - font-size: 18px; - } + &_col { + &-title { + font-size: 16px; } + } + .mobile { &_user { &-link { padding: 15px 20px; @@ -1700,21 +1723,27 @@ } &_search { + flex-direction: column; + &-title { font-size: 28px; } &-btn { - padding: 15px 25px; + padding: 12px 20px; + margin-top: 15px; font-size: 14px; + width: 100%; } &-input { - width: calc(100% - 99px); + width: 100%; margin-right: 0; input { font-size: 14px; + padding: 12px 15px; + width: calc(100% - 30px); } } } diff --git a/themes/berkarar/assets/css/components/3-page/404.scss b/themes/berkarar/assets/css/components/3-page/404.scss new file mode 100644 index 0000000..1f08e4d --- /dev/null +++ b/themes/berkarar/assets/css/components/3-page/404.scss @@ -0,0 +1,78 @@ +// 404 =================== +.error { + padding: 80px 0 100px; + + &_box { + display: flex; + align-items: center; + justify-content: space-between; + max-width: 1200px; + margin: 0 auto; + } + + &_icon { + width: calc(50% - 80px); + + img { + @include ImgCon; + } + } + + &_info { + width: calc(50% - 80px); + display: flex; + flex-direction: column; + align-items: flex-start; + } + + &_sup-title { + font-size: 100px; + font-weight: 700; + line-height: 1.3; + } + + &_title { + font-size: 28px; + font-weight: 700; + line-height: 1.3; + color: #FFB100; + margin: 40px 0 25px; + } + + &_txt { + font-size: 18px; + font-weight: 500; + line-height: 1.3; + color: $gray; + max-width: 400px; + } + + &_link { + display: flex; + align-items: center; + + font-size: 14px; + font-weight: 700; + line-height: 1.3; + padding: 16px 25px; + margin-top: 40px; + background: #FFB100; + border-radius: 5px; + cursor: pointer; + + span { + display: block; + margin-left: 10px; + width: 20px; + height: 20px; + + svg { + @include ImgCon; + display: block; + } + } + } + +} + +// 404 end =============== \ No newline at end of file diff --git a/themes/berkarar/assets/css/components/3-page/home.scss b/themes/berkarar/assets/css/components/3-page/home.scss index ec37650..f8ab1a1 100755 --- a/themes/berkarar/assets/css/components/3-page/home.scss +++ b/themes/berkarar/assets/css/components/3-page/home.scss @@ -729,6 +729,13 @@ line-height: 1.3; text-transform: uppercase; color: #FFFFFF; + + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } &-txt { @@ -737,6 +744,14 @@ line-height: 1.2; color: #FFFFFF; margin: 10px 0 25px; + min-height: 34px; + + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } &-row { diff --git a/themes/berkarar/assets/css/main.css b/themes/berkarar/assets/css/main.css index 6e43dca..8f53e28 100755 --- a/themes/berkarar/assets/css/main.css +++ b/themes/berkarar/assets/css/main.css @@ -41,6 +41,14 @@ body { -moz-box-sizing: border-box; -webkit-font-smoothing: antialiased; -moz-font-smoothing: antialiased; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + min-height: 100vh; } body.active { overflow: hidden; @@ -150,7 +158,7 @@ input[type=date]::-webkit-calendar-picker-indicator { position: relative; top: 0; } -.header.active { +.header.fixed { position: fixed; top: 0; left: 0; @@ -343,7 +351,7 @@ input[type=date]::-webkit-calendar-picker-indicator { -ms-flex-pack: center; justify-content: center; cursor: pointer; - padding: 12px 15px; + padding: 15px 12px; background: #fff; border-radius: 10px; font-weight: 700; @@ -510,7 +518,7 @@ input[type=date]::-webkit-calendar-picker-indicator { padding: 20px 0; background: #171717; } -.nav.active { +.nav.fixed { position: fixed; top: 110px; left: 0; @@ -542,7 +550,8 @@ input[type=date]::-webkit-calendar-picker-indicator { display: block; margin-right: 40px; } -.nav_list li a { +.nav_list li a, +.nav_list li h6 { font-weight: 700; font-size: 12px; line-height: 15px; @@ -559,27 +568,32 @@ input[type=date]::-webkit-calendar-picker-indicator { transition: all 0.2s ease-in-out 0s; -moz-transition: all 0.2s ease-in-out 0s; } -.nav_list li a span { +.nav_list li a span, +.nav_list li h6 span { display: block; width: 20px; height: 20px; margin-right: 10px; } -.nav_list li a span svg { +.nav_list li a span svg, +.nav_list li h6 span svg { width: 100%; height: 100%; object-fit: contain; -o-object-fit: contain; } -.nav_list li a span svg path { +.nav_list li a span svg path, +.nav_list li h6 span svg path { -webkit-transition: all 0.2s ease-in-out 0s; transition: all 0.2s ease-in-out 0s; -moz-transition: all 0.2s ease-in-out 0s; } -.nav_list li a:hover { +.nav_list li a:hover, +.nav_list li h6:hover { color: #FFB100; } -.nav_list li a:hover path { +.nav_list li a:hover path, +.nav_list li h6:hover path { fill: #FFB100; } .nav_list li .more { @@ -687,9 +701,6 @@ input[type=date]::-webkit-calendar-picker-indicator { .menu_wrap { margin-bottom: 20px; } -.menu .mobile_buttons { - display: none; -} .menu::-webkit-scrollbar { display: none; } @@ -768,7 +779,7 @@ input[type=date]::-webkit-calendar-picker-indicator { display: flex; } .menu_col { - width: calc(20% - 80px); + width: calc(20% - 64px); margin-right: 80px; position: relative; display: block; @@ -780,7 +791,7 @@ input[type=date]::-webkit-calendar-picker-indicator { right: -40px; height: 100%; width: 1px; - background: #fff; + background: #8E8E8E; } .menu_col:last-child { margin-right: 0; @@ -796,7 +807,7 @@ input[type=date]::-webkit-calendar-picker-indicator { } .menu_col-title { font-weight: 700; - font-size: 14px; + font-size: 16px; line-height: 1.2; color: #FFB100; margin-bottom: 25px; @@ -805,7 +816,7 @@ input[type=date]::-webkit-calendar-picker-indicator { display: block; margin-bottom: 20px; font-weight: 700; - font-size: 14px; + font-size: 16px; line-height: 1.2; color: #FFFFFF; -webkit-transition: all 0.2s ease-in-out 0s; @@ -883,63 +894,6 @@ input[type=date]::-webkit-calendar-picker-indicator { -moz-transition: all 0.2s ease-in-out 0s; } -.mobile_navs { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; - margin-bottom: 70px; -} -.mobile_navs-list { - width: calc(50% - 50px); - background: #292929; - padding: 20px; - border-radius: 5px; - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -ms-flex-wrap: wrap; - flex-wrap: wrap; -} -.mobile_navs-list li { - margin: 0 30px 20px 0; -} -.mobile_navs-list a { - font-size: 13px; - font-weight: 400; - line-height: 1.3; - color: #fff; - text-transform: uppercase; -} -.mobile_profile { - background: #292929; - width: calc(50% - 50px); - padding: 20px; - border-radius: 5px; -} -.mobile_profile-title { - width: 100%; - color: #FFF; - font-size: 13px; - font-weight: 700; - line-height: 1.3; - padding-bottom: 15px; - margin-bottom: 25px; - border-bottom: 1px solid #fff; - text-align: center; -} -.mobile_profile-link { - text-align: center; - color: #FFF; - font-size: 13px; - font-weight: 400; - line-height: 1.3; - display: block; - margin-bottom: 25px; -} - .crumb { padding: 40px 0 0; } @@ -1204,6 +1158,7 @@ input[type=date]::-webkit-calendar-picker-indicator { .footer { padding: 80px 0; + margin: auto 0 0 0; background: #292929; } .footer_box { @@ -1224,7 +1179,7 @@ input[type=date]::-webkit-calendar-picker-indicator { right: -40px; height: 100%; width: 1px; - background: #fff; + background: #8E8E8E; } .footer_col:last-child { margin-right: 0; @@ -1267,7 +1222,7 @@ input[type=date]::-webkit-calendar-picker-indicator { -webkit-box-pack: justify; -ms-flex-pack: justify; justify-content: space-between; - border-top: 1px solid #fff; + border-top: 1px solid #8E8E8E; margin-top: 50px; padding-top: 50px; } @@ -1286,7 +1241,7 @@ input[type=date]::-webkit-calendar-picker-indicator { margin-bottom: 0; } .footer_navs-link p { - font-size: 12px; + font-size: 16px; font-weight: 400; line-height: 1.3; color: #fff; @@ -1300,8 +1255,8 @@ input[type=date]::-webkit-calendar-picker-indicator { } .footer_navs-link span { display: block; - width: 16px; - height: 16px; + width: 20px; + height: 20px; margin-right: 10px; } .footer_navs-link span svg { @@ -1317,7 +1272,7 @@ input[type=date]::-webkit-calendar-picker-indicator { line-height: 1.3; } .footer_navs .copyright { - font-size: 12px; + font-size: 16px; font-weight: 700; line-height: 1.3; margin-bottom: 24px; @@ -1329,7 +1284,7 @@ input[type=date]::-webkit-calendar-picker-indicator { margin-bottom: 0; } .footer_navs ul a { - font-size: 12px; + font-size: 16px; font-weight: 400; line-height: 1.3; color: #fff; @@ -1351,8 +1306,8 @@ input[type=date]::-webkit-calendar-picker-indicator { } .footer_navs ul a span { display: block; - width: 16px; - height: 16px; + width: 20px; + height: 20px; margin-right: 10px; } .footer_navs ul a span svg { @@ -2073,6 +2028,12 @@ input[type=date]::-webkit-calendar-picker-indicator { line-height: 1.3; text-transform: uppercase; color: #FFFFFF; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } .rest_item-txt { font-weight: 400; @@ -2080,6 +2041,13 @@ input[type=date]::-webkit-calendar-picker-indicator { line-height: 1.2; color: #FFFFFF; margin: 10px 0 25px; + min-height: 34px; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } .rest_item-row { display: -webkit-box; @@ -3135,6 +3103,93 @@ input[type=date]::-webkit-calendar-picker-indicator { margin: -15px -12px; } +.error { + padding: 80px 0 100px; +} +.error_box { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + max-width: 1200px; + margin: 0 auto; +} +.error_icon { + width: calc(50% - 80px); +} +.error_icon img { + width: 100%; + height: 100%; + object-fit: contain; + -o-object-fit: contain; +} +.error_info { + width: calc(50% - 80px); + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; +} +.error_sup-title { + font-size: 100px; + font-weight: 700; + line-height: 1.3; +} +.error_title { + font-size: 28px; + font-weight: 700; + line-height: 1.3; + color: #FFB100; + margin: 40px 0 25px; +} +.error_txt { + font-size: 18px; + font-weight: 500; + line-height: 1.3; + color: #292929; + max-width: 400px; +} +.error_link { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + font-size: 14px; + font-weight: 700; + line-height: 1.3; + padding: 16px 25px; + margin-top: 40px; + background: #FFB100; + border-radius: 5px; + cursor: pointer; +} +.error_link span { + display: block; + margin-left: 10px; + width: 20px; + height: 20px; +} +.error_link span svg { + width: 100%; + height: 100%; + object-fit: contain; + -o-object-fit: contain; + display: block; +} + /* Slider */ .slick-slider { position: relative; @@ -3584,10 +3639,6 @@ input[type=date]::-webkit-calendar-picker-indicator { width: 310px; height: 40px; } - .header .burger { - width: 40px; - height: 40px; - } .header .lang_current { padding: 10px; } @@ -3835,6 +3886,16 @@ input[type=date]::-webkit-calendar-picker-indicator { .auto_container { padding: 0 20px; } + .menu_box { + -ms-flex-wrap: wrap; + flex-wrap: wrap; + } + .menu_col { + width: calc(33.33% - 80px); + } + .menu_col:nth-child(3)::after { + display: none; + } .rest.page { padding: 40px 0; } @@ -3933,48 +3994,7 @@ input[type=date]::-webkit-calendar-picker-indicator { } .menu.active { top: 90px; - height: calc(100% - 90px); - } - .menu .mobile_buttons { - display: block; - margin-bottom: 25px; - } - .menu .mobile_buttons .row { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -ms-flex-pack: distribute; - justify-content: space-around; - padding: 20px; - background: #171717; - border-radius: 5px; - } - .menu .mobile_buttons-link { - font-weight: 700; - font-size: 18px; - line-height: 1.4; - color: #fff; - margin-right: 10px; - display: block; - } - .menu .mobile_buttons-link:last-child { - margin-right: 0; - } - .menu .mobile_buttons-link a { - font-weight: 700; - font-size: 18px; - line-height: 1.4; - color: #fff; - margin-right: 10px; - display: block; - margin: 40px 0 0 0; - display: none; - } - .menu .mobile_buttons-link a.active { - display: block; + height: calc(100% - 89px); } .menu .mobile_user-link { width: calc(100% - 40px); @@ -4046,28 +4066,6 @@ input[type=date]::-webkit-calendar-picker-indicator { .menu_col:nth-child(3)::after { display: none; } - .mobile_navs { - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - } - .mobile_navs-list { - width: calc(100% - 40px); - margin-bottom: 25px; - } - .mobile_profile { - width: calc(100% - 40px); - } - .mobile_profile-title { - font-size: 16px; - margin-bottom: 30px; - padding-bottom: 15px; - } - .mobile_profile-link { - font-size: 16px; - margin-bottom: 15px; - } .shops_item { width: calc(50% - 16px); margin: 10px 8px; @@ -4109,16 +4107,21 @@ input[type=date]::-webkit-calendar-picker-indicator { -ms-flex-order: 1; order: 1; } + .error { + padding: 50px 0; + } + .error_icon { + display: none; + } + .error_info { + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + text-align: center; + width: 100%; + } } @media (max-width: 900px) { - .menu .mobile_buttons { - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; - } - .menu .mobile_buttons-link { - font-size: 18px; - } .menu_search { padding-top: 30px; } @@ -4277,26 +4280,73 @@ input[type=date]::-webkit-calendar-picker-indicator { width: calc(100% - 210px); height: 35px; } - .menu .mobile_buttons .row { - -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; - -ms-flex-wrap: wrap; - flex-wrap: wrap; - -webkit-box-align: unset; - -ms-flex-align: unset; - align-items: unset; - padding: 20px 30px; + .header .burger { + height: 32px; + border-radius: 50%; } - .menu .mobile_buttons-link { - font-size: 16px; - width: calc(50% - 20px); - margin: 15px 10px; - text-align: center; + .header .burger span { + margin-right: 0; + } + .header .burger p { + display: none; + } + .menu_col { + margin: 0; + width: 100%; + } + .menu_col:last-child { + margin-bottom: 0; + } + .menu_col:nth-child(3) { + margin-right: 0; + } + .menu_col:nth-child(3)::after { + content: none; + } + .menu_col::after { + content: none; + } + .menu_col-group { + margin-bottom: 15px; + } + .menu_col-group:last-child { + margin-bottom: 15px; + } + .menu_col-title { + font-size: 18px; + } + .menu_col-box { + overflow: hidden; + max-height: 0; + -webkit-transition: all 0.2s ease-in-out 0s; + transition: all 0.2s ease-in-out 0s; + -moz-transition: all 0.2s ease-in-out 0s; + } + .menu_col-box::-webkit-scrollbar { + display: none; + } + .menu_col-link { + position: relative; + padding-left: 50px; + } + .menu_col-link::before { + content: ""; + position: absolute; + top: 50%; + left: 20px; + transform: translateY(-50%); + -moz-ransform: translateY(-50%); + -o-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -webkit-transform: translateY(-50%); + width: 10px; + height: 10px; + background: url("../images/svg/nav_link-arrow.png") no-repeat center; } .menu .footer_navs { margin-top: 30px; padding-top: 30px; + padding-bottom: 20px; } .shops_tab { -ms-flex-wrap: wrap; @@ -4632,6 +4682,18 @@ input[type=date]::-webkit-calendar-picker-indicator { width: 100%; margin-top: 15px; } + .error_sup-title { + font-size: 60px; + } + .error_title { + font-size: 22px; + } + .error_txt { + font-size: 14px; + } + .error_link { + font-size: 14px; + } } @media (max-width: 520px) { .auto_container { @@ -4640,6 +4702,15 @@ input[type=date]::-webkit-calendar-picker-indicator { .header { padding: 25px 0; } + .header .burger { + height: 28px; + } + .header .burger span { + width: 20px; + } + .header .burger span::before, .header .burger span::after { + width: 20px; + } .header .lang_current { padding: 8px; } @@ -4653,31 +4724,12 @@ input[type=date]::-webkit-calendar-picker-indicator { .header .logo { width: calc(100% - 160px); } - .header .burger { - width: 36px; - height: 36px; - } .menu.active { top: 85px; height: calc(100% - 85px); } - .menu .mobile_buttons { - background: none; - } - .menu .mobile_buttons .row { - background: none; - padding: 0; - } - .menu .mobile_buttons-link { - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - width: calc(100% - 30px); - margin: 0 0 15px; - padding: 20px 15px; - background: #171717; - font-size: 18px; + .menu_col-title { + font-size: 16px; } .menu .mobile_user-link { padding: 15px 20px; @@ -4689,19 +4741,29 @@ input[type=date]::-webkit-calendar-picker-indicator { .menu .mobile_user-link a { font-size: 18px; } + .menu_search { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + } .menu_search-title { font-size: 28px; } .menu_search-btn { - padding: 15px 25px; + padding: 12px 20px; + margin-top: 15px; font-size: 14px; + width: 100%; } .menu_search-input { - width: calc(100% - 99px); + width: 100%; margin-right: 0; } .menu_search-input input { font-size: 14px; + padding: 12px 15px; + width: calc(100% - 30px); } .hero_item { height: 500px; diff --git a/themes/berkarar/assets/css/main.scss b/themes/berkarar/assets/css/main.scss index f8d61e6..3807efb 100755 --- a/themes/berkarar/assets/css/main.scss +++ b/themes/berkarar/assets/css/main.scss @@ -21,6 +21,7 @@ @import "./components/3-page/contact.scss"; @import "./components/3-page/post.scss"; @import "./components/3-page/result.scss"; +@import "./components/3-page/404.scss"; @import "./components/2-layout/slick.scss"; @import "./components/2-layout/slick-theme.scss"; diff --git a/themes/berkarar/assets/images/404.png b/themes/berkarar/assets/images/404.png new file mode 100644 index 0000000..5b89073 Binary files /dev/null and b/themes/berkarar/assets/images/404.png differ diff --git a/themes/berkarar/assets/images/about-pics-1.png b/themes/berkarar/assets/images/about-pics-1.png deleted file mode 100755 index d70c906..0000000 Binary files a/themes/berkarar/assets/images/about-pics-1.png and /dev/null differ diff --git a/themes/berkarar/assets/images/about-pics-2.png b/themes/berkarar/assets/images/about-pics-2.png deleted file mode 100755 index e91c67c..0000000 Binary files a/themes/berkarar/assets/images/about-pics-2.png and /dev/null differ diff --git a/themes/berkarar/assets/images/about-pics-3.png b/themes/berkarar/assets/images/about-pics-3.png deleted file mode 100755 index ca3c8df..0000000 Binary files a/themes/berkarar/assets/images/about-pics-3.png and /dev/null differ diff --git a/themes/berkarar/assets/images/about-pics-4.png b/themes/berkarar/assets/images/about-pics-4.png deleted file mode 100755 index 60884bb..0000000 Binary files a/themes/berkarar/assets/images/about-pics-4.png and /dev/null differ diff --git a/themes/berkarar/assets/images/about-pics-5.png b/themes/berkarar/assets/images/about-pics-5.png deleted file mode 100755 index 666f090..0000000 Binary files a/themes/berkarar/assets/images/about-pics-5.png and /dev/null differ diff --git a/themes/berkarar/assets/images/movie-photo.jpg b/themes/berkarar/assets/images/movie-photo.jpg deleted file mode 100755 index d46f5d7..0000000 Binary files a/themes/berkarar/assets/images/movie-photo.jpg and /dev/null differ diff --git a/themes/berkarar/assets/images/movie-pic-1.png b/themes/berkarar/assets/images/movie-pic-1.png deleted file mode 100755 index 55c9459..0000000 Binary files a/themes/berkarar/assets/images/movie-pic-1.png and /dev/null differ diff --git a/themes/berkarar/assets/images/movie-pic-2.png b/themes/berkarar/assets/images/movie-pic-2.png deleted file mode 100755 index 416d151..0000000 Binary files a/themes/berkarar/assets/images/movie-pic-2.png and /dev/null differ diff --git a/themes/berkarar/assets/images/rahat-coffee.png b/themes/berkarar/assets/images/rahat-coffee.png deleted file mode 100755 index a753f3d..0000000 Binary files a/themes/berkarar/assets/images/rahat-coffee.png and /dev/null differ diff --git a/themes/berkarar/assets/images/restaurant-1.png b/themes/berkarar/assets/images/restaurant-1.png deleted file mode 100755 index 2a1779d..0000000 Binary files a/themes/berkarar/assets/images/restaurant-1.png and /dev/null differ diff --git a/themes/berkarar/assets/images/restaurant-2.png b/themes/berkarar/assets/images/restaurant-2.png deleted file mode 100755 index eeb0bd4..0000000 Binary files a/themes/berkarar/assets/images/restaurant-2.png and /dev/null differ diff --git a/themes/berkarar/assets/images/shop-1.png b/themes/berkarar/assets/images/shop-1.png deleted file mode 100755 index 05d4b46..0000000 Binary files a/themes/berkarar/assets/images/shop-1.png and /dev/null differ diff --git a/themes/berkarar/assets/images/shop-2.png b/themes/berkarar/assets/images/shop-2.png deleted file mode 100755 index 45ac726..0000000 Binary files a/themes/berkarar/assets/images/shop-2.png and /dev/null differ diff --git a/themes/berkarar/assets/js/main.js b/themes/berkarar/assets/js/main.js index 0bde70b..8bb5870 100755 --- a/themes/berkarar/assets/js/main.js +++ b/themes/berkarar/assets/js/main.js @@ -35,11 +35,11 @@ window.onscroll = function () { scrollPosition = Math.round(window.scrollY); if (scrollPosition > 500) { - document.querySelector('.header').classList.add('active'); - document.querySelector('.nav').classList.add('active'); + document.querySelector('.header').classList.add('fixed'); + document.querySelector('.nav').classList.add('fixed'); } else { - document.querySelector('.header').classList.remove('active'); - document.querySelector('.nav').classList.remove('active'); + document.querySelector('.header').classList.remove('fixed'); + document.querySelector('.nav').classList.remove('fixed'); } }; @@ -74,8 +74,8 @@ if (burger != undefined) { burger.addEventListener('click', function () { sleep(2).then(() => { menu.classList.toggle('active'); - header.classList.add('active'); - nav.classList.add('active'); + header.classList.toggle('active'); + nav.classList.toggle('active'); body.classList.toggle('active'); burger.classList.toggle('active'); }) @@ -158,3 +158,24 @@ if (user_title != undefined) { +// Accordion ============================= + +let accordion = document.getElementsByClassName("accord"); +// let i; +// let e; + +for (i = 0; i < accordion.length; i++) { + accordion[i].addEventListener("click", function () { + this.classList.toggle("active"); + let panel = this.nextElementSibling; + if (panel.style.maxHeight) { + panel.style.maxHeight = null; + panel.classList.remove("active") + } else { + panel.style.maxHeight = "100000px"; + panel.classList.add("active") + } + }); +} + +// Accordion end ========================= \ No newline at end of file diff --git a/themes/berkarar/pages/404.htm b/themes/berkarar/pages/404.htm new file mode 100644 index 0000000..e78d3e0 --- /dev/null +++ b/themes/berkarar/pages/404.htm @@ -0,0 +1,44 @@ +title = "404" +url = "/404" +layout = "default" +is_hidden = 0 +== + + + +
+
+
+
+
+ 404-icon +
+ +
+

+ 404 +

+

+ Что то не так +

+

+ Этой страницы не существует, либо вы перешли по не коректной ссылке +

+ + Перейти на главную страницу + + + + + + + +
+
+
+
+
+ \ No newline at end of file diff --git a/themes/berkarar/partials/site/header.htm b/themes/berkarar/partials/site/header.htm index ba2556e..aa15f77 100755 --- a/themes/berkarar/partials/site/header.htm +++ b/themes/berkarar/partials/site/header.htm @@ -5,122 +5,6 @@ function onStart(){ } ?> == - -
diff --git a/themes/berkarar/partials/site/navigation.htm b/themes/berkarar/partials/site/navigation.htm index 9103bac..bb114cf 100755 --- a/themes/berkarar/partials/site/navigation.htm +++ b/themes/berkarar/partials/site/navigation.htm @@ -53,17 +53,23 @@ function onStart(){
  • {% if user %} - + + + + + + + + Профиль + + {% else %} - +
    @@ -86,7 +92,7 @@ function onStart(){ Вход - + {% endif %}
    • @@ -113,52 +119,6 @@ function onStart(){ НАЙТИ - -
    -
    - Подробней о нас - Контакты - Схема ТРЦ -

    Вход

    -
    -
    - -
    - - - {% if user %} - - Profile - -
    - -
    - {{user.name}} -
    - - - Profile - - Выйти -
    - {% endif %} -
    {% for item in category_settings %} @@ -166,12 +126,14 @@ function onStart(){ {% for key, i in item %} {% for top_category in top_categories.slice(i.start,1) %}
    - + {{top_category.name}} - {% for category in top_category.getCategories(i.limit) %} - {{category.name}} - {% endfor %} +
    + {% for category in top_category.getCategories(i.limit) %} + {{category.name}} + {% endfor %} +
    {% endfor %}