Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Тимофей Семененко
/
shold.dev5.ashmanov.com
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 4538efaf
authored
Aug 21, 2017
by
Semenenko Timofey
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
filter part5
1 parent
c2bb5812
Pipeline
#2868
for
4538efaf
skipped
in 0 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
87 additions
and
29 deletions
css/main.css
css/media.css
local/components/cpeople/project.map/templates/.default/template.php
local/include/header_phone_mobile.php
local/templates/main/header.php
css/main.css
View file @
4538efa
...
@@ -1071,6 +1071,19 @@ BUTTON {
...
@@ -1071,6 +1071,19 @@ BUTTON {
position
:
relative
;
position
:
relative
;
padding-right
:
16px
;
padding-right
:
16px
;
}
}
.phone-values
{
margin-bottom
:
15px
;
display
:
inline-block
;
color
:
#ffffff
;
font-size
:
1.6rem
;
line-height
:
1.6rem
;
font-weight
:
bold
;
letter-spacing
:
1px
;
vertical-align
:
middle
;
text-align
:
left
;
position
:
relative
;
padding-right
:
16px
;
}
.phone-value
:after
{
.phone-value
:after
{
content
:
""
;
content
:
""
;
position
:
absolute
;
position
:
absolute
;
...
...
css/media.css
View file @
4538efa
...
@@ -70,8 +70,9 @@ span#header_search_wrap.mobile i {
...
@@ -70,8 +70,9 @@ 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.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
{
position
:
absolute
;
right
:
100%
;
color
:
transparent
;
border
:
2px
solid
;
border-right-color
:
transparent
;
background
:
#fff
;
padding
:
6px
20px
7px
14px
;
top
:
-2px
;
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_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
;}
#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
;}
#result_list
{
position
:
absolute
;
display
:
none
;
left
:
-170px
;
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
);}
#result_list
{
position
:
absolute
;
display
:
none
;
left
:
-170px
;
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
);}
...
@@ -149,7 +150,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
...
@@ -149,7 +150,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.header
.fav-link-icon
{
position
:
absolute
;
width
:
39px
;
height
:
39px
;
left
:
34%
;
top
:
8px
;}
.header
.fav-link-icon
{
position
:
absolute
;
width
:
39px
;
height
:
39px
;
left
:
34%
;
top
:
8px
;}
.header._fixed
.fav-link
{
top
:
8px
;}
.header._fixed
.fav-link
{
top
:
8px
;}
.header
.fav-link-icon
:after
{
margin
:
-12px
0
0
-11px
;}
.header
.fav-link-icon
:after
{
margin
:
-12px
0
0
-11px
;}
.header
.fav-link-count
,
.header
.fav-link-clear
{
left
:
5px
;}
.header
.fav-link-count
,
.header
.fav-link-clear
{
left
:
-
5px
;}
.out_sub_menu
{
top
:
220px
;
z-index
:
10
;}
.out_sub_menu
{
top
:
220px
;
z-index
:
10
;}
.page-head._bigger
+
.page-content
{
/* padding-top:180px; */
}
.page-head._bigger
+
.page-content
{
/* padding-top:180px; */
}
.projects-list
{
margin-top
:
0
;
position
:
relative
;
z-index
:
20
;}
.projects-list
{
margin-top
:
0
;
position
:
relative
;
z-index
:
20
;}
...
@@ -321,6 +322,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
...
@@ -321,6 +322,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
.project-gallery
.project-gallery-item._plan
{
background-size
:
contain
;}
.project-gallery
.project-gallery-item._plan
{
background-size
:
contain
;}
}
}
@media
(
max-width
:
767px
){
.project-gallery-item-title-abs
{
font-size
:
2.2rem
;
line-height
:
2.5rem
;}
@media
(
max-width
:
767px
){
.project-gallery-item-title-abs
{
font-size
:
2.2rem
;
line-height
:
2.5rem
;}
.project-info-link
{
/* width: 50%; */
margin
:
0
;}
.project-info-link
{
/* width: 50%; */
margin
:
0
;}
.project-info-link-wr
{
margin-top
:
0
;}
.project-info-link-wr
{
margin-top
:
0
;}
.project-price-order
{
/* width: 50%; */
}
.project-price-order
{
/* width: 50%; */
}
...
@@ -453,7 +455,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
...
@@ -453,7 +455,7 @@ li.additional_list_item{margin-bottom:20px;float:left;}
position
:
absolute
;
position
:
absolute
;
width
:
37px
;
width
:
37px
;
height
:
37px
;
height
:
37px
;
left
:
38%
;
left
:
-10px
;
top
:
8px
;
top
:
8px
;
}
}
...
@@ -467,5 +469,6 @@ li.additional_list_item{margin-bottom:20px;float:left;}
...
@@ -467,5 +469,6 @@ li.additional_list_item{margin-bottom:20px;float:left;}
width
:
100%
;
width
:
100%
;
padding
:
4px
;
padding
:
4px
;
}
}
}
}
local/components/cpeople/project.map/templates/.default/template.php
View file @
4538efa
<?
//26.04.2017 Hawks
CModule
::
IncludeModule
(
'nurgush.mobiledetect'
);
$detect
=
new
Nurgush\MobileDetect\Main
();
// Для мобыльных
if
(
$detect
->
isMobile
()
&&
!
$detect
->
isTablet
()){
?>
<?
<?
/** @var $item \SH\Entities\Project */
require
(
$_SERVER
[
"DOCUMENT_ROOT"
]
.
"/bitrix/header.php"
);
?>
/** @var $region \SH\Entities\ProjectRegion */
?>
<div
class=
"map js-map"
>
<div
class=
"map js-map"
>
<div
class=
"map-map"
data-default-center=
"50,42"
>
<div
class=
"map-map"
data-default-center=
"50,42"
>
...
@@ -16,28 +23,49 @@
...
@@ -16,28 +23,49 @@
<a
href=
"#!"
class=
"contacts-map-zoom _out js-zoom-out"
></a>
<a
href=
"#!"
class=
"contacts-map-zoom _out js-zoom-out"
></a>
<div
class=
"map-map-container js-projects-map"
></div>
<div
class=
"map-map-container js-projects-map"
></div>
</div>
</div>
<div
class=
"map-content"
>
</div>
<div
class=
"map-content-wr js-map-content"
>
<script>
<div
class=
"map-content-projects"
>
<?
include
'script-content.php'
?>
<div
class=
"scroll-content js-scroll-content"
>
<?
include
'map-content-projects.php'
?>
</div>
</script>
</div>
<?
require
(
$_SERVER
[
"DOCUMENT_ROOT"
]
.
"/bitrix/footer.php"
);
?>
<div
class=
"map-content-switch js-map-switch "
>
<?
}
else
{
?>
<div
class=
"scroll-controls js-scroll-controls"
></div>
<div
class=
"map js-map"
>
<div
class=
"map-map"
data-default-center=
"50,42"
>
<div
class=
"path"
>
<ul
class=
"path-elements"
>
<li
class=
"path-elements-item"
><a
href=
"/"
>
Главная
</a>
</li>
</ul>
<h1
class=
"path-current"
>
Проекты
</h1>
<a
href=
"/projects/"
class=
"map-list-link"
>
Списком
</a>
</div>
</div>
<div
class=
"map-content-texts"
>
<a
href=
"#!"
class=
"contacts-map-zoom _in js-zoom-in"
></a>
<div
class=
"scroll-content js-scroll-content"
>
<a
href=
"#!"
class=
"contacts-map-zoom _out js-zoom-out"
></a>
<?
include
'map-content-texts.php'
?>
<div
class=
"map-map-container js-projects-map"
></div>
</div>
<div
class=
"map-content"
>
<div
class=
"map-content-wr js-map-content"
>
<div
class=
"map-content-projects"
>
<div
class=
"scroll-content js-scroll-content"
>
<?
include
'map-content-projects.php'
?>
</div>
</div>
<div
class=
"map-content-switch js-map-switch "
>
<div
class=
"scroll-controls js-scroll-controls"
></div>
</div>
<div
class=
"map-content-texts"
>
<div
class=
"scroll-content js-scroll-content"
>
<?
include
'map-content-texts.php'
?>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
<script>
<?
include
'script-content.php'
?>
<?
include
'script-content.php'
?>
</script>
</script>
<?
}
?>
local/include/header_phone_mobile.php
0 → 100644
View file @
4538efa
<div
class=
"phone-values"
itemscope
itemtype=
"http://schema.org/Organization"
>
<span
itemprop=
"telephone"
><a
href=
"tel:+7 (495) 645–44–30"
>
+7 (495) 645–44–30
</a></span>
<span
itemprop=
"telephone"
style=
"display:none"
>
+7 (495) 645-44-34
</span>
</div>
\ No newline at end of file
\ No newline at end of file
local/templates/main/header.php
View file @
4538efa
...
@@ -20,9 +20,6 @@ global $USER;
...
@@ -20,9 +20,6 @@ global $USER;
'https://www.googletagmanager.com/gtm.js?id='
+
i
+
dl
;
f
.
parentNode
.
insertBefore
(
j
,
f
);
'https://www.googletagmanager.com/gtm.js?id='
+
i
+
dl
;
f
.
parentNode
.
insertBefore
(
j
,
f
);
})(
window
,
document
,
'script'
,
'dataLayer'
,
'GTM-W9G6NXM'
);
</script>
})(
window
,
document
,
'script'
,
'dataLayer'
,
'GTM-W9G6NXM'
);
</script>
<!-- End Google Tag Manager -->
<!-- End Google Tag Manager -->
<script>
if (screen.width>768) document.write('<link rel="stylesheet" href="/css/main.css?
<?=
filemtime
(
BASE_PATH
.
'/css/main.css'
)
?>
" id="
pre_load
"
>
'
);
</script>
<script>
if (screen.width>768) document.write('<link rel="stylesheet" href="/css/main.css?
<?=
filemtime
(
BASE_PATH
.
'/css/main.css'
)
?>
" id="
pre_load
"
>
'
);
</script>
<script
src=
"/js/modernizr.js"
type=
"text/javascript"
async
></script>
<script
src=
"/js/modernizr.js"
type=
"text/javascript"
async
></script>
...
@@ -108,7 +105,13 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
...
@@ -108,7 +105,13 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
<script>
if
(
screen
.
width
<=
768
)
document
.
body
.
style
.
display
=
"none"
;
</script>
<script>
if
(
screen
.
width
<=
768
)
document
.
body
.
style
.
display
=
"none"
;
</script>
<?
//$APPLICATION->ShowPanel()?>
<?
//$APPLICATION->ShowPanel()?>
<?
if
(
$_SERVER
[
'REQUEST_URI'
]
==
'/projects/map/'
){
?>
<?
if
(
$_SERVER
[
'REQUEST_URI'
]
==
'/projects/map/'
){
?>
<div
class=
"container _full"
>
<?
CModule
::
IncludeModule
(
'nurgush.mobiledetect'
);
$detect
=
new
Nurgush\MobileDetect\Main
();
if
(
$detect
->
isMobile
()
&&
!
$detect
->
isTablet
()){
?>
<div
class=
"container _top"
>
<?
}
else
{
?>
<div
class=
"container _full"
>
<?
}
?>
<?
}
else
{
?>
<?
}
else
{
?>
<div
class=
"container _top"
>
<div
class=
"container _top"
>
<?
}
?>
<?
}
?>
...
@@ -126,8 +129,15 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
...
@@ -126,8 +129,15 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
<form
class=
"search-form"
method=
"get"
action=
"/search/"
<?
if
(
$APPLICATION
->
GetCurDir
()
==
"/search/"
){
?>
style=
"width: 670px;"
<?
}
?>
>
<form
class=
"search-form"
method=
"get"
action=
"/search/"
<?
if
(
$APPLICATION
->
GetCurDir
()
==
"/search/"
){
?>
style=
"width: 670px;"
<?
}
?>
>
<span
id=
'header_search_wrap'
>
<span
id=
'header_search_wrap'
>
<div
class=
"search-from__inner"
>
<div
class=
"search-from__inner"
>
<?
CModule
::
IncludeModule
(
'nurgush.mobiledetect'
);
$detect
=
new
Nurgush\MobileDetect\Main
();
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
{
?>
<input
type=
"text"
id=
'header_search'
class=
"search_ios"
autocomplete=
'off'
placeholder=
"Введите название"
name=
"q"
value=
"
<?=
$_GET
[
'q'
]
?>
"
>
<?
}
?>
</div>
</div>
<ul
id=
'result_list'
></ul>
<ul
id=
'result_list'
></ul>
<i
class=
'flaticon-search'
></i>
<i
class=
'flaticon-search'
></i>
...
@@ -144,7 +154,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
...
@@ -144,7 +154,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
<div
id=
"myDIV"
>
<div
id=
"myDIV"
>
<div
style=
"display: none"
class=
"project js-project"
>
<div
style=
"display: none"
class=
"project js-project"
>
<?
include
INCLUDE_PATH
.
'header
-phon
e.php'
?>
<?
include
INCLUDE_PATH
.
'header
_phone_mobil
e.php'
?>
<a
href=
"#order_price"
id=
"close"
class=
'phone-call js-order-project'
>
Заказать звонок
</a>
<a
href=
"#order_price"
id=
"close"
class=
'phone-call js-order-project'
>
Заказать звонок
</a>
</div>
</div>
<?
$APPLICATION
->
IncludeComponent
(
'cpeople:form'
,
'callback'
)
?>
<?
$APPLICATION
->
IncludeComponent
(
'cpeople:form'
,
'callback'
)
?>
...
@@ -226,7 +236,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
...
@@ -226,7 +236,7 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
global
$APPLICATION
;
global
$APPLICATION
;
$result
=
''
;
$result
=
''
;
if
(
!
$APPLICATION
->
GetProperty
(
'HIDE_PAGE_CONTENT'
))
$result
.=
'<div class="page-content">'
;
if
(
!
$APPLICATION
->
GetProperty
(
'HIDE_PAGE_CONTENT'
))
$result
.=
'<div class="page-content">'
;
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
;
})
?>
})
?>
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment