Skip to content

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

Go to a project
Commit 0b8bccfb by Semenenko Timofey
Options

finish change

1 parent b1307a3b
Pipeline #2825 for 0b8bccfb skipped in 0 seconds
Inline Side-by-side
Showing 13 changed files with 240 additions and 40 deletions
css/main.css
......@@ -5646,14 +5646,33 @@ cursor:pointer;
color: #919499;
letter-spacing: 1px;
}
.author-left {
display: table-cell;
width: 275px;
vertical-align: middle;
text-align: left;
padding-left: 30px;
font-size: 1.3rem;
line-height: 2rem;
color: #919499;
letter-spacing: 1px;
}
.author A {
color: white;
text-decoration: none;
font-weight: bold;
}
.author-left A {
color: white;
text-decoration: none;
font-weight: bold;
}
.author A:hover {
text-decoration: underline;
}
.author-left A:hover {
text-decoration: underline;
}
#imagelightbox {
cursor: pointer;
......@@ -6958,3 +6977,4 @@ cursor:pointer;
.project-gallery-items.mobile{
display: show;
}
css/media.css
......@@ -25,11 +25,12 @@ format('svg');font-weight:normal;font-style:normal;}
#previewer_toggle{display:none;}
.projects_listing_ul{margin-top:-75px !important;}
.out_sub_menu > .filter-element > div.filter-element._all{display:none;}
.project-price-order{display:block;border:0;background:rgb(125 , 148 , 115);color:white;font-size:1.2rem;line-height:52px;font-weight:bold;text-transform:uppercase;padding:0 16px;text-align:center;-webkit-transition:all 0.2s;transition:all 0.2s;width:235px;margin:30px auto 25px;}
.project-price-order{display:block;border:0;background:rgb(125 , 148 , 115); color:white;font-size:1.2rem;line-height:52px;font-weight:bold;text-transform:uppercase;padding:0 16px;text-align:center;-webkit-transition:all 0.2s;transition:all 0.2s;width:235px;margin:30px auto 25px;}
.project-shar{display:block;border:0;/* background:rgb(125 , 148 , 115); */color:white;font-size:1.2rem;line-height:52px;font-weight:bold;text-transform:uppercase;padding:0 16px;text-align:center;-webkit-transition:all 0.2s;transition:all 0.2s;width:235px;margin:30px auto 25px;}
.project-price-order:hover{text-decoration:none;background:#000;}
.fav-link-icon{left:10%;}
.header .fav-link-count, .header .fav-link-clear{left:14px;}
.slimScrollDiv{left:0;bottom:0;top:71px;position:absolute !important;width:150px !important;padding-bottom:71px;z-index:151;}
.slimScrollDiv{left:0;bottom:0;top: 73px;position:absolute !important;width:150px !important;padding-bottom:71px;z-index:151;}
h4.project-gallery-item-title{height:auto !important;left:160px;}
.slimScrollBar{background:#fff !important;}
.project-gallery-previews{position:relative;white-space:nowrap;top:auto;z-index:2;font-size:0;line-height:0;-webkit-transition:all 0.4s;transition:all 0.4s;width:140px;height:100%;overflow-y:scroll;overflow-x:hidden;}
......@@ -96,11 +97,11 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.teaser_text_left_button{text-transform:uppercase;font-size:1.5rem;text-decoration:none;font-weight:bold;background:#f2803c;padding:17px 30px;position:relative;border:0;color:white;font-family:"Open Sans", Arial, sans-serif;cursor:pointer;display:inline-block;margin:0;vertical-align:middle;-webkit-transition:ease-out 0.5s;-o-transition:ease-out 0.5s;transition:ease-out 0.5s;}
.teaser_text_left_button:hover{text-decoration:none;color:#f2803c;background:#fff;}
.out_sub_menu{position:absolute;z-index:100;width:100%;left:0;top:130px;}
.projects-list{margin-top: -80px;}
.projects-list{/*margin-top:150px;*/}
.filter._inner-page{display:block;left:50%;bottom:50px;z-index:50;margin-left:-251px;top:50%;margin-top:-41px;}
.filter._inner-page > .filter-element{height:auto;}
.filter._inner-page .filter-element._type .filter-type{display:inline-block;height:auto;padding:25px 40px;}
.out_sub_menu > .filter-element{display:table;height:120px;margin:0 auto;text-align:center;width:100%;}
.out_sub_menu > .filter-element{display:table;height: 70px;margin:0 auto;text-align:center;width:100%;}
.out_sub_menu > .filter-element > div{display:table-cell;vertical-align:middle;background:#f37e43 !important;height:100%;}
.out_sub_menu .filter-element._parent > .filter-element > .filter-element{display:inline-block;height:100%;}
.out_sub_menu .filter-element._select:before{display:none;}
......@@ -109,7 +110,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.out_sub_menu .filter-chosable._active SPAN:before{background-image:url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iU2hhcGVfNDNfMV8iIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCINCgkgeT0iMHB4IiB3aWR0aD0iMTBweCIgaGVpZ2h0PSI3cHgiIHZpZXdCb3g9Ii00MTUgMjk0LjMgMTAgNyIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAtNDE1IDI5NC4zIDEwIDc7Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+DQoJLnN0MHtmaWxsOiMzMjJGMkM7fQ0KPC9zdHlsZT4NCjxnIGlkPSJTaGFwZV80MyI+DQoJPGc+DQoJCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iLTQwNi42LDI5NC4zIC00MTEuNCwyOTkuMSAtNDEzLjIsMjk3LjEgLTQxNC41LDI5OC40IC00MTEuNCwzMDEuMyAtNDA1LjMsMjk1LjUgCQkiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==');background-repeat:no-repeat;background-size:100% 100%;}
.out_sub_menu .filter-option{font-size:1.4rem;line-height:3.8rem;padding:0 25px;display:inline-block;}
.out_sub_menu .filter-element._bathhouse, .out_sub_menu .filter-element._misc{width:auto;background:#f37e43 !important;}
.out_sub_menu .filter-inner-wrap{border-left:1px solid #B56136;padding:0 25px;}
.out_sub_menu .filter-inner-wrap{border-left:1px solid #B56136;padding: 10px 25px;}
.in_filter_block{}
.stages_slider .owl-item div{background-size:cover;background-position:center center;}
.stage_item_desc{position:absolute;background:white;left:20px;bottom:35px;height:auto !important;font-size:1.3rem;line-height:2rem;padding:12px 20px;color:#5b5b5b;max-width:400px;}
......@@ -148,8 +149,8 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.header._fixed .fav-link{top:8px;}
.header .fav-link-icon:after{margin:-12px 0 0 -11px;}
.header .fav-link-count, .header .fav-link-clear{left:-12px;}
.out_sub_menu{top:193px;z-index:10;}
.page-head._bigger + .page-content{padding-top:180px;}
.out_sub_menu{/*top:193px*/;z-index:10;}
.page-head._bigger + .page-content{/* padding-top:180px; */}
.projects-list{margin-top:0;position:relative;z-index:20;}
.filter._inner-page{margin:0;bottom:auto;left:0;width:100%;top:100%;}
.filter{display:block;}
......@@ -202,7 +203,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.path-current{padding:0 5px;}
.page-head._bigger .path-current{margin-bottom:6px;}
.page-head._mp{overflow:hidden;}
.page-content{padding:20px 0 30px 0;}
.page-content{padding: 63px 0 30px 0;}
._top .path{padding-top:70px;text-align:center;margin:0;}
.page-head._bigger .path{padding-top:3px;margin:0;text-align:center;}
.page-head._bigger .phone{bottom:7px;top:auto;left:0;width:100%;}
......@@ -329,7 +330,10 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.main-page .container{padding-top:0;}
.out_sub_menu .filter-inner-wrap{border:none;}
.out_sub_menu .filter-element._parent > .filter-element > .filter-element:nth-child(odd){border-right:1px solid #B56136;}
.out_sub_menu .filter-element._house .filter-select{height:90px !important;}
.out_sub_menu .filter-element._house .filter-select{height: 90px !important;}
.out_sub_menu .filter-element _bathhouse .filter-select {
height: 80px !important;
}
.out_sub_menu .filter-element._house > div{width:49% !important;height:50% !important;}
.filter._inner-page .filter-element._type .filter-type{padding:25px 0;}
.out_sub_menu .filter-select-item{line-height:1rem;}
......@@ -369,7 +373,8 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.path-elements-item{float:none;display:inline;}
.filter-select-item, .filter._inner-page-slide .filter-link{font-size:1.3rem;line-height:3rem;}
.filter._inner-page .filter-element._parent{height:145px;}
.page-head._bigger + .page-content{padding-top: 85px;}
.page-head._bigger + .page-content{/* padding-top: 230px; */}
.page-head._bigger + .page-content.mobile{/*padding-top: 85px;*/}
.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-content{opacity:0.8;}
......@@ -433,5 +438,37 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.owl-carousel, .owl-carousel {
height: 250px;
}
/*.phone a[href^="tel:"]{ color: #000000;*/
/*text-transform: uppercase;*/
/*text-decoration: none;*/
/*display: block;*/
/*line-height: 42px;*/
/*font-weight: bold;*/
/*font-size: 1.4rem;*/
/*padding: 0 16px;*/
/*-webkit-transition: 0.4s;*/
/*transition: 0.4s;*/
/*z-index: 20;*/
/*position: relative;}*/
/*.phone a[href^="tel:"] {*/
/*text-shadow: 0px 0px 0px;*/
/*}*/
/*.phone-call {*/
/*top: -10px;*/
/*text-align: center;*/
/*}*/
.footer > * {
display: block;
text-align: center;
width: 100%;
padding: 4px;
}
/*.phone {*/
/*position: absolute;*/
/*right: 30px;*/
/*top: 87%;*/
/*z-index: 49;*/
/*}*/
}
\ No newline at end of file
js/compiled.js
......@@ -17166,15 +17166,24 @@ jQuery.event.special.dblclick = {
App.win.on('resize', updateHeight).trigger('resize');
})(jQuery);
// $('.project-gallery-items').click(function (event) {
// $(document).ready(function() {
//
//
// $(".project-gallery-items").click(function() {
//
//
// $(this).replaceWith("<div class='project-gallery-items'>" + $(this).html() + "</div>");
//
// });
// });
// $('.filter-element _house _inactive').click(function (event) {
// if (screen.width <= '724') {
// if ( 'display:none' ) {
// alert();
// $('.project-gallery-items').addClass('mobile');
//
// // $('.').addClass('mobile');
//
// }
// }
//
// });
// $('.project-gallery-items')('onckick'.function(){
......
js/index.js
......@@ -379,3 +379,4 @@ $(document).ready(function() {
})
local/components/cpeople/project/templates/.default/detail-gallery.php
......@@ -168,6 +168,7 @@ $prevNum = 0; ?>
<a href="#!" class="project-gallery-previews-close js-project-gallery-previews-toggle"></a>
<div class="project-gallery-paging js-project-gallery-paging"></div>
<ul class="project-gallery-previews-wr js-project-previews">
<? $imgNumber = 0 ?>
<? $imgsChunked = array_chunk($arImage['images'], 12) ?>
......@@ -191,11 +192,13 @@ $prevNum = 0; ?>
</li>
<? }
else {
$imgNumber++;
?>
<li class='video_preview_wrap'>
<a href="#!" class="project-gallery-previews-item js-project-gallery-preview video_previewer" data-goto="<?=$pr_key;?>" ></a>
......
local/components/cpeople/project/templates/.default/detail.php
......@@ -66,7 +66,6 @@ $gallery = $item->getPreviewGallery();
<? } ?>
</div>
<? } ?>
<div class="project-info-link-wr">
<span class="va"></span>
<? if(isset($planImageI)) { ?>
......@@ -86,6 +85,7 @@ $gallery = $item->getPreviewGallery();
</div>
<div class="page-content">
<div class="project js-project">
<div class="centering">
......@@ -93,6 +93,7 @@ $gallery = $item->getPreviewGallery();
<?= $item->DETAIL_TEXT ?>
</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)) { ?>
<?
......
local/include/project-filter.php
......@@ -64,16 +64,106 @@
<? }?>
<? } ?>
</div>
<?if($APPLICATION->GetCurPage() != '/') {?> </div>
<? if ($_SERVER['REQUEST_URI'] == '/projects/') { ?>
<style>
/*.page-content {*/
/*!*padding: 100px 0 30px 0;*!*/
/*}*/
/*.projects-list {*/
/*margin-top: 45px;*/
/*}*/
.text-content H1 {
margin: 0;
padding: 0;
}
.static-content {
padding-bottom: 0;
margin-top: 40px;
}
@media (max-width: 1000px) {
@media (max-width: 1024px) {
.page-head._bigger + .page-content {
padding-top: 0px;
}
}
</style>
<?}?>
<? if ($_SERVER['REQUEST_URI'] == '/projects/doma-iz-kleenogo-brusa/'){ ?>
<style>
.page-content {
/*padding: 100px 0 30px 0;*/
}
.projects-list {
margin-top: 80px;
}
.text-content H1 {
margin: 0;
padding: 0;
}
.static-content {
padding-bottom: 0;
margin-top: 40px;
}
@media (max-width: 1000px) {
.out_sub_menu {
top: 193px;
z-index: 10;
}
}
@media (max-width: 1024px) {
.page-head._bigger + .page-content {
padding-top: 200px;
}
}
</style>
<?if($APPLICATION->GetCurPage() != '/') {?> </div>
<?}if ($_SERVER['REQUEST_URI'] == '/projects/bani-iz-kleenogo-brusa/'){?>
<style>
.page-content {
padding: 100px 0 30px 0;
/*padding: 100px 0 30px 0;*/
}
.projects-list {
margin-top: 45px;
}
.text-content H1 {
margin: 0;
padding: 0;
}
.static-content {
padding-bottom: 0;
margin-top: 40px;
}
@media (max-width: 1000px) {
.out_sub_menu {
/*top: 193px;*/
z-index: 10;
}
}
@media (max-width: 1024px) {
.page-head._bigger + .page-content {
padding-top: 100px;
}
}
</style>
<?}if ($_SERVER['REQUEST_URI'] == '/projects/raznye-proekty/'){?>
<style>
.page-content {
/*padding: 100px 0 30px 0;*/
}
.projects-list {
margin-top: 45px;
}
.text-content H1 {
margin: 0;
padding: 0;
......@@ -82,9 +172,23 @@
padding-bottom: 0;
margin-top: 40px;
}
@media (max-width: 1000px) {
.out_sub_menu {
top: 193px;
z-index: 10;
}
}
@media (max-width: 1024px) {
.page-head._bigger + .page-content {
padding-top: 230px;
}
}
</style>
<?}?>
<?}?>
<?if($APPLICATION->GetCurPage() != '/') {?> <div class='out_sub_menu'> <?}?>
......
local/templates/.default/components/bitrix/menu/top/template.php
......@@ -16,6 +16,13 @@ $curUri = $APPLICATION->GetCurUri();
</li>
<? endforeach ?>
<li class="main-menu-item"><a href="https://stroy.basecamphq.com/login" class="main-menu-item-link" target="_blank" rel="nofollow">Войти</a></li>
<!-- <div class="phone">-->
<!-- <li class="js-project">-->
<!-- <li class="main-menu-sub-item"><a href="tel:+7 (495) 645–44–30">+7 (495) 645–44–30</a></li>-->
<!-- <a href="#order_price" class='phone-call js-order-project'>Заказать звонок</a>-->
<!-- </li>-->
<!-- --><?//$APPLICATION->IncludeComponent('cpeople:form', 'callback')?>
<!-- </div>-->
</ul>
<? } ?>
<!-- //secret-button -->
\ No newline at end of file
local/templates/main/footer.php
......@@ -12,23 +12,16 @@ global $APPLICATION;
<? if(!$APPLICATION->GetProperty('HIDE_FOOTER')) { ?>
<footer class="footer">
<div class="copy">© <?= date('Y') ?> ООО «Строй Хауз»</div>
<?
//26.04.2017 Hawks
CModule::IncludeModule('nurgush.mobiledetect');
$detect = new Nurgush\MobileDetect\Main();
// Для мобыльных
if(!$detect->isMobile() && !$detect->isTablet()){?>
<div class="js-project">
<a href="#order_price" class='js-order-project'><div id="call-button"></div></a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'callback')?>
<div id="call-button"></div>
if($detect->isMobile() && !$detect->isTablet()){?>
<?}else{?>
<div class="copy">© <?= date('Y') ?> ООО «Строй Хауз»</div>
<?}?>
<div id="upbutton"></div>
<?
......@@ -38,12 +31,12 @@ CModule::IncludeModule('nurgush.mobiledetect');
$detect = new Nurgush\MobileDetect\Main();
// Для мобыльных и планшетов
if($detect->isMobile() || $detect->isTablet()){?>
<a class="author" href="/company/" >Наша компания</a>
<a class="author" href="/projects/">Список проектов</a>
<a class="author" href="/services/">Услуги</a>
<a class="author" href="price/design-cost/" ">Цены</a>
<a class="author" href="/info/lumber/">Полезная информация</a>
<a class="author" href="/contacts/">Контакты</a>
<span><a class="author-left" href="/company/" >Наша компания</a>
<a class="author" href="/projects/">Список проектов</a></span>
<span><a class="author-left" href="/services/">Услуги</a>
<a class="author" href="/info/lumber/">Полезная информация</a></span>
<span><a class="author-left" href="price/design-cost/" ">Цены</a>
<a class="author" href="/contacts/">Контакты</a></span>
<? if (isset($_COOKIE['mobile'])) { ?><meta name=viewport content="width=1024, initial-scale=0.1"><? } else { ?><meta name=viewport content="width=device-width, initial-scale=1"><? } ?>
......@@ -51,12 +44,19 @@ if($detect->isMobile() || $detect->isTablet()){?>
<a class="author">Stroy House</a>
<a class="author">info@s-h.ru</a>
<!-- <a class="author">Россия, Московская область, Истринский район, Веледниково, улица Живописная, дом 25.</a>-->
<a class="author">Россия, Москва, Селивёрстов переулок, 1А</a>
<a class="author">+7 (495) 645–44–30</a>
<a class="author">Россия, Москва, Селивёрстов переулок, 1А</a>
<?}else{?>
<?}?>
<!--noindex-->
<?
//26.04.2017 Hawks
CModule::IncludeModule('nurgush.mobiledetect');
$detect = new Nurgush\MobileDetect\Main();
// Для мобыльных
if(!$detect->isMobile() && !$detect->isTablet()){?>
<ul class="social-links">
<?/*<li class="social-links-item"><a href="http://twitter.com/stroyhouse" class="social-links-link _tw" target="_blank" rel="nofollow"></a></li>*/?>
<li class="social-links-item"><a href="//www.facebook.com/pages/Derevannye-doma-ot-Stroj-Hauz/161048223937817" class="social-links-link _fb" target="_blank" rel="nofollow"></a></li>
......@@ -67,7 +67,22 @@ if($detect->isMobile() || $detect->isTablet()){?>
</ul>
<!--/noindex-->
<div class="author">Сайт срубили — <a href="http://cpeople.ru/">CreativePeople</a></div>
</footer>
</footer>
<?}else{?>
<ul class="social-links">
<?/*<li class="social-links-item"><a href="http://twitter.com/stroyhouse" class="social-links-link _tw" target="_blank" rel="nofollow"></a></li>*/?>
<li class="social-links-item"><a href="//www.facebook.com/pages/Derevannye-doma-ot-Stroj-Hauz/161048223937817" class="social-links-link _fb" target="_blank" rel="nofollow"></a></li>
<li class="social-links-item"><a href="//vkontakte.ru/club21826597" class="social-links-link _vk" target="_blank" rel="nofollow"></a></li>
<?/*<li class="social-links-item"><a href="//www.odnoklassniki.ru/group/55514216595503" class="social-links-link _ok" target="_blank" rel="nofollow"></a></li>*/?>
<li class="social-links-item"><a href="//www.youtube.com/user/StroyHouse" class="social-links-link _yt" target="_blank" rel="nofollow"></a></li>
<li class="social-links-item"><a href="//instagram.com/stroyhouse/" class="social-links-link _inst"></a></li>
</ul>
<!--/noindex-->
<div class="author">Сайт срубили — <a href="http://cpeople.ru/">CreativePeople</a></div>
<div class="copy">© <?= date('Y') ?> ООО «Строй Хауз»</div>
</footer>
<?}?>
<?}?>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,700,700italic,800,800italic,300italic,300&subset=latin,cyrillic-ext' rel='stylesheet' type='text/css'>
......@@ -87,6 +102,8 @@ document.cookie=id+"; path=/; expires="+ws.toGMTString();
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="//maps.googleapis.com/maps/api/js?v=3.exp"></script>
<script src="/js/compiled.js?<?=filemtime(BASE_PATH . '/js/compiled.js')?>" type="text/javascript"></script>
<script src="//yastatic.net/es5-shims/0.0.2/es5-shims.min.js"></script>
<script src="//yastatic.net/share2/share.js"></script>
<script src="/js/jquery.maskedinput.js?<?=filemtime(BASE_PATH . '/js/jquery.maskedinput.js')?>" type="text/javascript"></script>
<script src="/js/index.js"></script>
......@@ -124,12 +141,13 @@ $(document).ready(function() {
<script>
$(document).ready(function() {
$(".project-gallery-items").fancybox({
openEffect : 'show',
closeEffect : 'show'
});
});
</script>
<script>
$(window).scroll(function() {
if ($(this).scrollTop() > 100) {
......@@ -150,9 +168,9 @@ $(document).ready(function() {
}
} else { $('#call-button').stop(true, false).fadeOut('fast'); }
});
// $('#call-button').click(function() {
// $('html, body').stop().animate({scrollTop : 0}, 300);
// });
$('#call-button').click(function() {
$('html, body').stop().animate({scrollTop : 0}, 300);
});
</script>
<script>
$(window).scroll(function(){
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!