Commit deb399c8 authored by andre's avatar andre

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	frontend/web/css/screen.css
parents fa8a5979 c29c5e07
...@@ -32,7 +32,6 @@ class PostController extends BaseController ...@@ -32,7 +32,6 @@ class PostController extends BaseController
'Tag-index' => 'Перезагрузка статей с учетом тэгов', 'Tag-index' => 'Перезагрузка статей с учетом тэгов',
]; ];
} }
/** /**
* Displays all Post models. * Displays all Post models.
* @return mixed * @return mixed
......
...@@ -824,6 +824,11 @@ a.toggle_bottom:hover .icon-arrowDown2:after, a.toggle_bottom:active .icon-arrow ...@@ -824,6 +824,11 @@ a.toggle_bottom:hover .icon-arrowDown2:after, a.toggle_bottom:active .icon-arrow
float: right; float: right;
margin-top: 0; margin-top: 0;
} }
#e_cat_two_scroll a.toggle_bottom {
position: absolute;
top: -200px;
margin-top: 0;
}
.video_sec a.toggle_bottom { .video_sec a.toggle_bottom {
margin-top: 153px; margin-top: 153px;
display: block !important; display: block !important;
......
...@@ -15282,6 +15282,147 @@ a.e_cat_btn { ...@@ -15282,6 +15282,147 @@ a.e_cat_btn {
margin-left: 0; margin-left: 0;
} }
.top_keys_promteh_wr {
background: #2d323a url(../images/top_keys_promteh_bg.jpg) 0 0 repeat-x;
}
.top_keys_promteh {
min-height: 640px;
background: url(../images/top_keys_promteh.jpg) no-repeat 50% 50%;
width: 100%;
position: relative;
}
.keys_promteh_dollar {
position: absolute;
top: 100px;
left: -400px;
z-index: 4;
}
.keys_promteh_euro {
position: absolute;
top: 380px;
left: -225px;
z-index: 4;
}
.keys_promteh_puble {
position: absolute;
top: 230px;
right: -370px;
z-index: 4;
}
.keys_promteh_cont {
min-height: 638px;
background: url(../images/keys_promteh_cont_img.png) 100% 100% no-repeat;
position: relative;
}
.keys_promteh_cont_in {
padding-top: 50px;
}
.top_keys_promteh h1 {
font-size: 36px;
line-height: 50px;
font-family: "RobotoBold";
color: #fff;
}
.keys_promteh_cont_in {
font-size: 17px;
line-height: 29px;
color: #fff;
}
.keys_promteh_cont_in strong {
color: #fff;
}
.logo_promteh {
position: absolute;
right: 0;
top: 70px;
font-size: 16px;
font-weight: bold;
}
.logo_promteh span {
display: block;
margin-left: 25px;
}
.keys_promteh_cont_in_pos {
padding-top: 85px;
}
.e_cat_two_scroll4 {
background-color: #2d323a;
}
.e_cat_two_scroll4 h2 {
background-color: #25d93e;
color: #2d323a;
}
.e_cat_two_scroll4 li {
background: url(../images/e_cat_list_4.png) no-repeat 0% 50%;
}
.e_cat_two_scroll4 a.keys_test_btn {
position: absolute;
top: -200px;
}
@media only screen and (max-width: 969px) {
.keys_promteh_dollar, .keys_promteh_euro, .keys_promteh_puble {
display: none;
}
.keys_promteh_cont {
background-size: 55%;
}
}
@media only screen and (max-width: 767px) {
.logo_promteh {
top: 220px;
}
.keys_promteh_cont_in_pos {
padding-top: 65px;
}
}
@media only screen and (max-width: 479px) {
.logo_promteh {
display: none;
}
.top_keys_promteh h1 {
font-size: 26px;
line-height: 30px;
}
.keys_promteh_cont {
background: none;
}
.keys_promteh_cont_in_pos {
padding-top: 35px;
}
.keys_promteh_cont {
min-height: 20px;
}
.top_keys_promteh {
min-height: 500px;
}
}
h2.subsc_blog_title{ h2.subsc_blog_title{
margin-top: 0 !important; margin-top: 0 !important;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment