Skip to content

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

Go to a project
Commit e6e9b46a by Semenenko Timofey
Options

финальные правки по задаче 25365

1 parent e4cc30fb
Inline Side-by-side
Showing 7 changed files with 37 additions and 14 deletions
css/main.css
...@@ -7663,8 +7663,8 @@ BUTTON { ...@@ -7663,8 +7663,8 @@ BUTTON {
background: #000000; background: #000000;
} }
.big-button._white { .big-button._white {
background-color: #fff; background-color: #000;
color: #000; color: #fff;
} }
.big-button._white:hover { .big-button._white:hover {
background: #000; background: #000;
...@@ -14719,3 +14719,14 @@ h2.resp-accordion:first-child { ...@@ -14719,3 +14719,14 @@ h2.resp-accordion:first-child {
top: 10px; top: 10px;
font-size: 14px; font-size: 14px;
} }
.button_up{
width:40px;
height:40px;
opacity:0.3;
position:fixed;
bottom:100px;
right:100px;
display:none;
text-indent:-9999px;
background: url(/img/SH.png) no-repeat;
}
\ No newline at end of file \ No newline at end of file
css/media.css
...@@ -70,7 +70,7 @@ span#header_search_wrap.mobile i { ...@@ -70,7 +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.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.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;}
...@@ -237,6 +237,17 @@ li.additional_list_item{margin-bottom:20px;float:left;} ...@@ -237,6 +237,17 @@ li.additional_list_item{margin-bottom:20px;float:left;}
/*.path-current{font-size:1.8rem;line-height:2rem;letter-spacing:1px;margin-top:17px;}*/ /*.path-current{font-size:1.8rem;line-height:2rem;letter-spacing:1px;margin-top:17px;}*/
.form-container{padding-top:0;} .form-container{padding-top:0;}
._top .page-head{height:185px;} ._top .page-head{height:185px;}
.button_up{
width:40px;
height:40px;
opacity:0.3;
position:fixed;
bottom:50px;
right:20px;
display:none;
text-indent:-9999px;
background: url(/img/SH.png) no-repeat;
}
} }
@media (max-width:992px){.project-gallery-item-title-abs{font-size:3rem;line-height:3.3rem;} @media (max-width:992px){.project-gallery-item-title-abs{font-size:3rem;line-height:3.3rem;}
......
img/SH.png 0 → 100644
img/SH.png

19.9 KB
img/svg/SH.psd 0 → 100644
No preview for this file type
js/index.js
...@@ -425,14 +425,14 @@ $(document).ready(function() { ...@@ -425,14 +425,14 @@ $(document).ready(function() {
return false; return false;
}); });
//2. Получить элемент, к которому необходимо добавить маску //2. Получить элемент, к которому необходимо добавить маску
$("#phone").mask("8(999) 999-9999"); $("#phone").mask("9(999) 999-9999");
$("#phone-feed").mask("8(999) 999-9999"); $("#phone-feed").mask("9(999) 999-9999");
$("#phone-cal").mask("8(999) 999-9999"); $("#phone-cal").mask("9(999) 999-9999");
$("#phone-order").mask("8(999) 999-9999"); $("#phone-order").mask("9(999) 999-9999");
$("#phone-start").mask("8(999) 999-9999"); $("#phone-start").mask("9(999) 999-9999");
$("#phone-popup").mask("8(999) 999-9999"); $("#phone-popup").mask("9(999) 999-9999");
$("#phone-proj").mask("8(999) 999-9999"); $("#phone-proj").mask("9(999) 999-9999");
$("#phone-credit").mask("8(999) 999-9999"); $("#phone-credit").mask("9(999) 999-9999");
$(document).ready(function() { $(document).ready(function() {
...@@ -519,7 +519,7 @@ $(document).ready(function() { ...@@ -519,7 +519,7 @@ $(document).ready(function() {
document.cookie=id+"; path=/; expires="+ws.toGMTString(); document.cookie=id+"; path=/; expires="+ws.toGMTString();
} }
$(window).scroll(function() { $(window).scroll(function() {
if ($(this).scrollTop() > 100) { if ($(this).scrollTop() > 1800) {
if ($('#upbutton').is(':hidden')) { if ($('#upbutton').is(':hidden')) {
$('#upbutton').css({opacity : 1}).fadeIn('slow'); $('#upbutton').css({opacity : 1}).fadeIn('slow');
} }
......
local/templates/main/footer.php
...@@ -17,7 +17,6 @@ global $APPLICATION; ...@@ -17,7 +17,6 @@ global $APPLICATION;
<?}else{?> <?}else{?>
<div class="copy">© <?= date('Y') ?> ООО «Строй Хауз»</div> <div class="copy">© <?= date('Y') ?> ООО «Строй Хауз»</div>
<?}?> <?}?>
<div id="upbutton"></div>
<? //22.06.2017 Hawks <? //22.06.2017 Hawks
CModule::IncludeModule('nurgush.mobiledetect'); CModule::IncludeModule('nurgush.mobiledetect');
...@@ -83,6 +82,7 @@ if($detect->isMobile() && !$detect->isTablet()){?> ...@@ -83,6 +82,7 @@ if($detect->isMobile() && !$detect->isTablet()){?>
<?}?> <?}?>
<?}?> <?}?>
<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'> <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'>
<script>if (screen.width<=768) {document.write('<link rel="stylesheet" href="/css/main.css?<?=filemtime(BASE_PATH . '/css/main.css')?>" id="pre_load">');document.body.style.display="block";}</script> <script>if (screen.width<=768) {document.write('<link rel="stylesheet" href="/css/main.css?<?=filemtime(BASE_PATH . '/css/main.css')?>" id="pre_load">');document.body.style.display="block";}</script>
<link rel="stylesheet" type='text/css' href="/css/flaticon.css"> <link rel="stylesheet" type='text/css' href="/css/flaticon.css">
...@@ -108,3 +108,4 @@ var s = document.createElement('script'); s.type = 'text/javascript'; s.async = ...@@ -108,3 +108,4 @@ var s = document.createElement('script'); s.type = 'text/javascript'; s.async =
<?php } ?> <?php } ?>
</body> </body>
</html> </html>
<div class="button_up" id="upbutton"></div>
\ No newline at end of file \ No newline at end of file
local/templates/main/header.php
...@@ -108,7 +108,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots" ...@@ -108,7 +108,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
<div class="search-from__inner"> <div class="search-from__inner">
<? CModule::IncludeModule('nurgush.mobiledetect'); <? CModule::IncludeModule('nurgush.mobiledetect');
$detect = new Nurgush\MobileDetect\Main(); $detect = new Nurgush\MobileDetect\Main();
if(!$detect->isIOS()){?> if($detect->isIOS()){?>
<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{?>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!