Skip to content

Тимофей Семененко / shold.dev5.ashmanov.com

Go to a project
Commit 106e5afa by Semenenko Timofey
Options

Финальные поправки клиента по задаче https://intranet.ashmanov.com/company/perso… 

…nal/user/1434/tasks/task/view/18931/
1 parent 7a844efc
Pipeline #2876 for 106e5afa skipped in 0 seconds
Inline Side-by-side
Showing 9 changed files with 58 additions and 56 deletions
css/main.css
This diff could not be displayed because it is too large.
css/media.css
...@@ -70,8 +70,7 @@ span#header_search_wrap.mobile i { ...@@ -70,8 +70,7 @@ span#header_search_wrap.mobile i {
.header._fixed span#header_search_wrap{top:15px;} .header._fixed span#header_search_wrap{top:15px;}
span#header_search_wrap i:before{position:absolute;left:6px;top:5px;} span#header_search_wrap i:before{position:absolute;left:6px;top:5px;}
span#header_search_wrap{position:absolute;right:77px;top:20px;width:37px;height:37px;-webkit-transition:all 0.4s;-o-transition:all 0.4s;transition:all 0.4s;} span#header_search_wrap{position:absolute;right:77px;top:20px;width:37px;height:37px;-webkit-transition:all 0.4s;-o-transition:all 0.4s;transition:all 0.4s;}
input#header_search.mobile{position:absolute;right:100%;color:transparent;border:2px solid;border-right-color:transparent;background:#fff;padding:6px 20px 7px 14px;top: -0.2rem;margin-right:-60px;-webkit-transition:ease-out 0.2s;-o-transition:ease-out 0.2s;transition:ease-out 0.2s;width:0px;z-index:101;visibility:hidden;} input#header_search.mobile{position:absolute;right:100%;color:transparent;border:2px solid;border-right-color:transparent;background:#fff;padding:6px 20px 7px 14px;top: -0.4rem;margin-right:-60px;-webkit-transition:ease-out 0.2s;-o-transition:ease-out 0.2s;transition:ease-out 0.2s;width:0px;z-index:101;visibility:hidden;}
input#header_search_ios.mobile{position:absolute;right:100%;color:transparent;border:2px solid;border-right-color:transparent;background:#fff;padding:6px 20px 7px 14px;top: -0.4rem;margin-right:-60px;-webkit-transition:ease-out 0.2s;-o-transition:ease-out 0.2s;transition:ease-out 0.2s;width:0px;z-index:101;visibility:hidden;}
input#header_search{position:absolute;right:100%;color:transparent;border:2px solid;border-right-color:transparent;background:#fff;padding:6px 20px 7px 14px;top: -0.2rem;margin-right: -15px;-webkit-transition:ease-out 0.2s;-o-transition:ease-out 0.2s;transition:ease-out 0.2s;width:0px;z-index:101;visibility:hidden;} input#header_search{position:absolute;right:100%;color:transparent;border:2px solid;border-right-color:transparent;background:#fff;padding:6px 20px 7px 14px;top: -0.2rem;margin-right: -15px;-webkit-transition:ease-out 0.2s;-o-transition:ease-out 0.2s;transition:ease-out 0.2s;width:0px;z-index:101;visibility:hidden;}
#result_list li a{display:block;text-align:left;padding:5px 15px;font-size:15px;color:inherit;} #result_list li a{display:block;text-align:left;padding:5px 15px;font-size:15px;color:inherit;}
#result_list li a:hover , #result_list li.active_res_item a{background:rgba(197, 197, 197, 0.82);text-decoration:none;} #result_list li a:hover , #result_list li.active_res_item a{background:rgba(197, 197, 197, 0.82);text-decoration:none;}
...@@ -172,7 +171,7 @@ li.additional_list_item{margin-bottom:20px;float:left;} ...@@ -172,7 +171,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.filter-element._house .filter-select{text-align:center;} .filter-element._house .filter-select{text-align:center;}
.filter._main-page ._misc .filter-option{width:33%;} .filter._main-page ._misc .filter-option{width:33%;}
.filter._inner-page .filter-element._parent > .filter-element._house .filter-select{height:100% !important;} .filter._inner-page .filter-element._parent > .filter-element._house .filter-select{height:100% !important;}
.project-reviews-item{width:100%;height:0;padding-bottom:56%;} .project-reviews-item{top: -20px;width:100%;height:0;padding-bottom:56%;}
._project .phone{display:none;} ._project .phone{display:none;}
._project .path{top:0;left:0;width:100%;} ._project .path{top:0;left:0;width:100%;}
.project-like{display:none;} .project-like{display:none;}
...@@ -332,7 +331,7 @@ li.additional_list_item{margin-bottom:20px;float:left;} ...@@ -332,7 +331,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.logo{width:107px;height:34px;top:20px;} .logo{width:107px;height:34px;top:20px;}
._fixed .logo{top:20px;} ._fixed .logo{top:20px;}
.header{background:none;} .header{background:none;}
.project-galleries , .project-gallery{overflow:visible;} .project-galleries , .project-gallery{top: 60px;overflow:visible;}
.project-gallery-items{overflow:hidden;} .project-gallery-items{overflow:hidden;}
.main-page .container{padding-top:0;} .main-page .container{padding-top:0;}
.out_sub_menu .filter-inner-wrap{border:none;} .out_sub_menu .filter-inner-wrap{border:none;}
...@@ -372,16 +371,17 @@ li.additional_list_item{margin-bottom:20px;float:left;} ...@@ -372,16 +371,17 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.project-info-specs-item:before{left:4px;display:none;} .project-info-specs-item:before{left:4px;display:none;}
._project .path-current{font-size:2.2rem;line-height:2.5rem;} ._project .path-current{font-size:2.2rem;line-height:2.5rem;}
.project-gallery-num{color:#fff;} .project-gallery-num{color:#fff;}
.project-info{bottom:auto;top:100%;margin-top:-66px;} .project-info{bottom:auto;top:100%;margin-top: -77px;}
.project-info.project-info-unik{margin-top:-62px;} .project-info.project-info-unik{margin-top:-62px;}
.project-info-specs{background-color:rgba(255, 255, 255, 0);} .project-info-specs{background-color:rgba(255, 255, 255, 0);}
span.project-info-specs-item{text-shadow:1px 1px 4px #fff , -1px -1px 4px #fff , 2px 0px 4px #fff , -2px 0px 4px #fff;padding:0 7px;margin:0 5px;} span.project-info-specs-item{text-shadow:1px 1px 4px #fff , -1px -1px 4px #fff , 2px 0px 4px #fff , -2px 0px 4px #fff;padding:0 7px;margin:0 5px;}
._project .path-elements{padding-top:3px;padding-bottom:4px;text-align:center;} ._project .path-elements{padding-top: 20px;padding-bottom:4px;text-align:center;}
.path-elements-item{float:none;display:inline;} .path-elements-item{float:none;display:inline;}
.filter-select-item, .filter._inner-page-slide .filter-link{font-size:1.3rem;line-height:3rem;} .filter-select-item, .filter._inner-page-slide .filter-link{font-size:1.3rem;line-height:3rem;}
.filter._inner-page .filter-element._parent{height:145px;} .filter._inner-page .filter-element._parent{height:145px;}
.page-head._bigger + .page-content{/* padding-top: 230px; */} .page-head._bigger + .page-content{/* padding-top: 230px; */}
.page-head._bigger + .page-content.mobile{/*padding-top: 85px;*/} .page-head._bigger + .page-content.mobile{/*padding-top: 85px;*/}
.page-head._bigger + .page-contents.mobile{/*padding-top: 85px;*/}
.houses-title{font-size:2.2rem;line-height:2.7rem;text-align:center;padding-bottom:15px;} .houses-title{font-size:2.2rem;line-height:2.7rem;text-align:center;padding-bottom:15px;}
.houses-list-item{float:none;width:100%;} .houses-list-item{float:none;width:100%;}
.houses-list-item-content{opacity:0.8;} .houses-list-item-content{opacity:0.8;}
...@@ -470,5 +470,15 @@ li.additional_list_item{margin-bottom:20px;float:left;} ...@@ -470,5 +470,15 @@ li.additional_list_item{margin-bottom:20px;float:left;}
padding: 4px; padding: 4px;
} }
.project-top {
top: 100px;
position: relative;
display: block;
margin: 0 auto;
background-size: cover;
background-position: center center;
}
#result_list{position:absolute;display:none;left: -125px;width: 207px;top:0px;z-index:100;border:2px solid;border-top:none;padding-top:40px;padding-bottom:5px;border-radius: 0 20px 0 0;color:#EB9D72;-webkit-transition:ease-out 0.2s;-o-transition:ease-out 0.2s;transition:ease-out 0.2s;background:rgba(255, 255, 255, 0.91);}
} }
js/compiled.js
...@@ -15548,7 +15548,7 @@ function idsStore() { ...@@ -15548,7 +15548,7 @@ function idsStore() {
success: function (data) { success: function (data) {
App.moreSuspended = true; App.moreSuspended = true;
$('.page-content').html(data); $('.page-contents').html(data);
App.doc.trigger('projects:reloaded'); App.doc.trigger('projects:reloaded');
setTimeout(function () { setTimeout(function () {
......
js/easyResponsiveTabs.js
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
itemCount++; itemCount++;
//дописываем событие для фильтра. //дописываем событие для фильтра.
if( $(".resp-accordion").on('click' , function(){ if( $(".resp-accordion").on('click' , function(){
$('.page-content').removeClass('mobile'); $('.page-contents').removeClass('mobile');
})); }));
}); });
......
js/index.js
...@@ -614,7 +614,7 @@ $(document).ready(function() { ...@@ -614,7 +614,7 @@ $(document).ready(function() {
}); });
$(".filter-element").on('click' , function(){ $(".filter-element").on('click' , function(){
$('.page-content').addClass('mobile'); $('.page-contents').addClass('mobile');
// $('.page-content').toggleClass('mobile'); // $('.page-content').toggleClass('mobile');
}); });
......
local/components/cpeople/project/templates/.default/detail.php
...@@ -88,47 +88,49 @@ $gallery = $item->getPreviewGallery(); ...@@ -88,47 +88,49 @@ $gallery = $item->getPreviewGallery();
<div class="page-content"> <div class="page-content">
<div class="project js-project"> <div class="project js-project">
</div>
<div class="project-top">
<div class="centering"> <div class="centering">
<div class="project-text"> <div class="project-text">
<?= $item->DETAIL_TEXT ?> <?= $item->DETAIL_TEXT ?>
</div>
</div> </div>
<div class="project-shar"><a><div class="ya-share2" data-services="facebook,vkontakte,whatsapp,skype,telegram"></div></a></div> <div class="project-shar"><a><div class="ya-share2" data-services="facebook,vkontakte,whatsapp,skype,telegram"></div></a></div>
<? if(($youtubeId = $item->getPropValue('YOUTUBE_URL')) && $youtubeId = getYoutubeId($youtubeId)) { ?> <? if(($youtubeId = $item->getPropValue('YOUTUBE_URL')) && $youtubeId = getYoutubeId($youtubeId)) { ?>
<? <?
$youtubePreview = $item->hasFile('YOUTUBE_PREVIEW') $youtubePreview = $item->hasFile('YOUTUBE_PREVIEW')
? $item->getImageThumb('YOUTUBE_PREVIEW', array('width' => 540, 'height' => 320, 'type' => 'put_out')) ? $item->getImageThumb('YOUTUBE_PREVIEW', array('width' => 540, 'height' => 320, 'type' => 'put_out'))
: '//img.youtube.com/vi/' . $youtubeId . '/0.jpg'; : '//img.youtube.com/vi/' . $youtubeId . '/0.jpg';
$youtubeTitle = $item->getPropValue('YOUTUBE_TITLE'); $youtubeTitle = $item->getPropValue('YOUTUBE_TITLE');
$youtubeText = $item->getPropValue('YOUTUBE_TEXT'); $youtubeText = $item->getPropValue('YOUTUBE_TEXT');
?> ?>
<div class="project-reviews"> <div class="project-reviews">
<a href="https://www.youtube.com/embed/<?= $youtubeId ?>?autoplay=1" class="project-reviews-item fancybox fancybox.iframe" style="background-image: url(<?= $youtubePreview ?>)"> <a href="https://www.youtube.com/embed/<?= $youtubeId ?>?autoplay=1" class="project-reviews-item fancybox fancybox.iframe" style="background-image: url(<?= $youtubePreview ?>)">
<? if($youtubeTitle || $youtubeText) { ?> <? if($youtubeTitle || $youtubeText) { ?>
<span class="project-reviews-item-text"> <span class="project-reviews-item-text">
<span class="project-reviews-item-title"><?= $youtubeTitle ?></span> <span class="project-reviews-item-title"><?= $youtubeTitle ?></span>
<span class="project-reviews-item-date"><?= $youtubeText ?></span> <span class="project-reviews-item-date"><?= $youtubeText ?></span>
</span> </span>
<? } ?> <? } ?>
<span class="project-reviews-item-play"></span> <span class="project-reviews-item-play"></span>
</a> </a>
</div> </div>
<? } ?> <? } ?>
</div>
<a href="#order_price" class='project-price-order js-order-project'>Узнать стоимость проекта</a> <a href="#order_price" class='project-price-order js-order-project'>Узнать стоимость проекта</a>
<h3 class="project-similar-title">Похожие проекты</h3> <h3 class="project-similar-title">Похожие проекты</h3>
<ul class="project-similar tiles js-tiles js-more-container projects-list" data-url="/ajax/project.php?similar-project=<?= $item->ID ?>"> <ul class="project-similar tiles js-tiles js-more-container projects-list" data-url="/ajax/project.php?similar-project=<?= $item->ID ?>">
<? require INCLUDE_PATH . 'project-list.php' ?> <? require INCLUDE_PATH . 'project-list.php' ?>
</ul> </ul>
<? if($arResult['REMAIN'] > 0) { ?> <? if($arResult['REMAIN'] > 0) { ?>
<div class="icon-preloader js-more-icon-preloader" data-mode="auto">Загрузка...</div> <div class="icon-preloader js-more-icon-preloader" data-mode="auto">Загрузка...</div>
<? } ?> <? } ?>
</div> </div>
</div> </div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup', array('PROJECT_CODE' => $arResult['ITEM']->CODE))?> <?$APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup', array('PROJECT_CODE' => $arResult['ITEM']->CODE))?>
<?$APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup_order', array('PROJECT_CODE' => $arResult['ITEM']->CODE))?> <?$APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup_order', array('PROJECT_CODE' => $arResult['ITEM']->CODE))?>
local/include/filter_params.php
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
$key == 'section' ? $input_class = 'section_input' : $input_class = 'value_input'; $key == 'section' ? $input_class = 'section_input' : $input_class = 'value_input';
?> ?>
<? if($code == 'all') { <? if($code == 'all') {
if($APPLICATION->GetCurPage() != '/') { if($APPLICATION->GetCurPage() != '/') {
...@@ -89,7 +86,7 @@ ...@@ -89,7 +86,7 @@
<style> <style>
.page-content { .page-contents {
padding: 23px 0 30px 0; padding: 23px 0 30px 0;
} }
.projects-list { .projects-list {
...@@ -121,7 +118,7 @@ ...@@ -121,7 +118,7 @@
<style> <style>
.page-content { .page-contents {
padding: 23px 0 30px 0; padding: 23px 0 30px 0;
} }
.projects-list { .projects-list {
...@@ -156,7 +153,7 @@ ...@@ -156,7 +153,7 @@
<style> <style>
.page-content { .page-contents {
padding: 10px 0 30px 0; padding: 10px 0 30px 0;
} }
.projects-list { .projects-list {
...@@ -241,11 +238,6 @@ ...@@ -241,11 +238,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="filter-element _bathhouse _inactive" data-type="bathhouse"> <div class="filter-element _bathhouse _inactive" data-type="bathhouse">
<? $key = 'bathhouse-floors'; $filterData = $projectFilter->getFilterData($key) ?> <? $key = 'bathhouse-floors'; $filterData = $projectFilter->getFilterData($key) ?>
...@@ -261,15 +253,6 @@ ...@@ -261,15 +253,6 @@
</div> </div>
<div class="filter-element _all _inactive" data-type="all"></div> <div class="filter-element _all _inactive" data-type="all"></div>
</div> </div>
<?if($APPLICATION->GetCurPage() == '/') {?> <button class="filter-element _submit filter-submit-button" type="submit">подобрать</button> <?}?> <?if($APPLICATION->GetCurPage() == '/') {?> <button class="filter-element _submit filter-submit-button" type="submit">подобрать</button> <?}?>
</div> </div>
</form> </form>
\ No newline at end of file \ No newline at end of file
local/include/filter_params_mobile.php
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<? if ($_SERVER['REQUEST_URI'] == '/projects/') { ?> <? if ($_SERVER['REQUEST_URI'] == '/projects/') { ?>
<style> <style>
.page-content { .page-contents {
padding: 85px 0 30px 0; padding: 85px 0 30px 0;
} }
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
</style> </style>
<form class="js-filter form-filter<? if ($arParams['IS_AJAX_FILTER']) { ?> ajax-filter<? } ?>" method="get" <form class="js-filter form-filter<? if ($arParams['IS_AJAX_FILTER']) { ?> ajax-filter<? } ?>" method="get"
action="/projects/<? if (!empty($arParams['IS_FAVE'])) { ?>fave/<? } ?>" id='search_form_main'> action="/projects/<? if (!empty($arParams['IS_FAVE'])) { ?>fave/<? } ?>" id='search_form_main'>
<? foreach ($projectFilter->getFilterData() as $key => $filterData) { ?> <? foreach ($projectFilter->getFilterData() as $key => $filterData) { ?>
<? foreach ($filterData['items'] as $code => $filterItem) { <? foreach ($filterData['items'] as $code => $filterItem) {
$key == 'section' ? $input_class = 'section_input' : $input_class = 'value_input'; $key == 'section' ? $input_class = 'section_input' : $input_class = 'value_input';
...@@ -101,10 +99,10 @@ ...@@ -101,10 +99,10 @@
<style> <style>
.page-content { .page-contents {
padding: 205px 0 30px 0; padding: 205px 0 30px 0;
} }
.page-content.mobile { .page-contents.mobile {
padding: 320px 0 30px 0; padding: 320px 0 30px 0;
} }
...@@ -315,7 +313,7 @@ if ($_SERVER['REQUEST_URI'] == '/projects/bani-iz-kleenogo-brusa/') { ...@@ -315,7 +313,7 @@ if ($_SERVER['REQUEST_URI'] == '/projects/bani-iz-kleenogo-brusa/') {
?> ?>
<style> <style>
.page-content { .page-contents {
padding: 105px 0 30px 0; padding: 105px 0 30px 0;
} }
...@@ -332,12 +330,12 @@ if ($_SERVER['REQUEST_URI'] == '/projects/bani-iz-kleenogo-brusa/') { ...@@ -332,12 +330,12 @@ if ($_SERVER['REQUEST_URI'] == '/projects/bani-iz-kleenogo-brusa/') {
padding-bottom: 0; padding-bottom: 0;
/*margin-top: 60px;*/ /*margin-top: 60px;*/
} }
.page-content.mobile { .page-contents.mobile {
padding-top: 180px; padding-top: 180px;
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {
.page-head._bigger + .page-content.mobile { .page-head._bigger + .page-contents.mobile {
padding-top: 200px; padding-top: 200px;
} }
</style> </style>
...@@ -452,7 +450,7 @@ if ($_SERVER['REQUEST_URI'] == '/projects/raznye-proekty/') { ...@@ -452,7 +450,7 @@ if ($_SERVER['REQUEST_URI'] == '/projects/raznye-proekty/') {
?> ?>
<style> <style>
.page-content { .page-contents {
padding: 105px 0 30px 0; padding: 105px 0 30px 0;
} }
...@@ -469,12 +467,12 @@ if ($_SERVER['REQUEST_URI'] == '/projects/raznye-proekty/') { ...@@ -469,12 +467,12 @@ if ($_SERVER['REQUEST_URI'] == '/projects/raznye-proekty/') {
padding-bottom: 0; padding-bottom: 0;
margin-top: 60px; margin-top: 60px;
} }
.page-content.mobile { .page-contents.mobile {
padding-top: 200px; padding-top: 200px;
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {
.page-head._bigger + .page-content { .page-head._bigger + .page-contents {
padding-top: 100px; padding-top: 100px;
} }
......
local/templates/main/header.php
...@@ -135,7 +135,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots" ...@@ -135,7 +135,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
<input type="text" id='header_search' autocomplete='off' placeholder="Введите название" name="q" value="<?=$_GET['q']?>"><!-- <input type="text" id='header_search' autocomplete='off' placeholder="Введите название" name="q" value="<?=$_GET['q']?>"><!--
--><!-- <button type="submit" class="search-button"><span class="site-styled-button__span">Найти</span></button> --> --><!-- <button type="submit" class="search-button"><span class="site-styled-button__span">Найти</span></button> -->
<?}else{?> <?}else{?>
<input type="text" id='header_search' class="search_ios" autocomplete='off' placeholder="Введите название" name="q" value="<?=$_GET['q']?>"> <input type="text" id='header_search' autocomplete='off' placeholder="Введите название" name="q" value="<?=$_GET['q']?>">
<?}?> <?}?>
</div> </div>
...@@ -231,7 +231,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots" ...@@ -231,7 +231,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
</div> </div>
<? return ob_get_clean(); <? return ob_get_clean();
}); ?> }); ?>
<?if (strpos($_SERVER['REQUEST_URI'], 'projects') == false){?>
<?$APPLICATION->AddBufferContent(function() { <?$APPLICATION->AddBufferContent(function() {
global $APPLICATION; global $APPLICATION;
$result = ''; $result = '';
...@@ -239,5 +239,14 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots" ...@@ -239,5 +239,14 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
if(!$APPLICATION->GetProperty('HIDE_CENTRING_WRAP') && ($_SERVER['REQUEST_URI'] !== '/contacts/')) $result .= '<div class="centering">'; if(!$APPLICATION->GetProperty('HIDE_CENTRING_WRAP') && ($_SERVER['REQUEST_URI'] !== '/contacts/')) $result .= '<div class="centering">';
return $result; return $result;
})?> })?>
<?}else{?>
<?$APPLICATION->AddBufferContent(function() {
global $APPLICATION;
$result = '';
if(!$APPLICATION->GetProperty('HIDE_PAGE_CONTENT')) $result .= '<div class="page-contents">';
if(!$APPLICATION->GetProperty('HIDE_CENTRING_WRAP') && ($_SERVER['REQUEST_URI'] !== '/contacts/')) $result .= '<div class="centering">';
return $result;
})?>
<?}?>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!