Commit bac2b7df authored by Олег Гиммельшпах's avatar Олег Гиммельшпах

Merge branch 'master' of git.task-on.com:ktask/taskoncom

parents 717b4b6f 5d025f3a
...@@ -21,7 +21,9 @@ $(function() { ...@@ -21,7 +21,9 @@ $(function() {
selector: "textarea", selector: "textarea",
theme: "modern", theme: "modern",
language: "ru", language: "ru",
schema: "html5",
custom_elements: "emstart,emend,header,main,span", custom_elements: "emstart,emend,header,main,span",
valid_children: '+a[div]',
extended_valid_elements: "span[id|name|class|style],i[id|name|class|style],ul[id|name|class|style],li[id|name|class|style],script[type|src],style", extended_valid_elements: "span[id|name|class|style],i[id|name|class|style],ul[id|name|class|style],li[id|name|class|style],script[type|src],style",
height: '350px', height: '350px',
menubar: "edit insert view format table tools", menubar: "edit insert view format table tools",
......
...@@ -41,7 +41,7 @@ class AppAsset extends AssetBundle ...@@ -41,7 +41,7 @@ class AppAsset extends AssetBundle
'/js/add_06.06.16.js', '/js/add_06.06.16.js',
'/js/modernizr.js', '/js/modernizr.js',
'/js/common.js', '/js/common.js',
'js/case-api.js' 'js/cases.js'
]; ];
public $depends = [ public $depends = [
'yii\web\YiiAsset', 'yii\web\YiiAsset',
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
return [ return [
'About' => 'О компании', 'About' => 'О компании',
'Portfolio' => 'Кейсы', 'Portfolio' => 'Кейсы',
'Business solutions' => 'Решения для бизнеса',
'Blog' => 'Блог', 'Blog' => 'Блог',
'Contacts' => 'Контакты', 'Contacts' => 'Контакты',
'Analytics school' => 'Школа аналитики', 'Analytics school' => 'Школа аналитики',
......
...@@ -12,10 +12,9 @@ use common\modules\languages\widgets\Languages; ...@@ -12,10 +12,9 @@ use common\modules\languages\widgets\Languages;
<ul> <ul>
<li><?=Html::a(\Yii::t('menu', 'About'), ['/about']);?></li> <li><?=Html::a(\Yii::t('menu', 'About'), ['/about']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Portfolio'), ['/portfolio']);?></li> <li><?=Html::a(\Yii::t('menu', 'Portfolio'), ['/portfolio']);?></li>
<li><?=Html::a(Yii::t('menu', 'Business solutions'), ['/business-cases']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Blog'), ['/blog']);?></li> <li><?=Html::a(\Yii::t('menu', 'Blog'), ['/blog']);?></li>
<!-- <li><?=Html::a(\Yii::t('menu', 'Analytics school'), ['/school']);?></li> -->
<li><?=Html::a(\Yii::t('menu', 'Contacts'), ['/contacts']);?></li> <li><?=Html::a(\Yii::t('menu', 'Contacts'), ['/contacts']);?></li>
<!-- <li>--><?//=Html::a(\Yii::t('menu', 'Faq'), ['/faq']);?><!--</li>-->
</ul> </ul>
</nav> </nav>
...@@ -32,11 +31,9 @@ use common\modules\languages\widgets\Languages; ...@@ -32,11 +31,9 @@ use common\modules\languages\widgets\Languages;
<ul> <ul>
<li><?=Html::a(\Yii::t('menu', 'About'), ['/about']);?></li> <li><?=Html::a(\Yii::t('menu', 'About'), ['/about']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Portfolio'), ['/portfolio']);?></li> <li><?=Html::a(\Yii::t('menu', 'Portfolio'), ['/portfolio']);?></li>
<li><?=Html::a('Решения для бизнеса', ['/business-cases']);?></li> <li><?=Html::a(Yii::t('menu', 'Business solutions'), ['/business-cases']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Blog'), ['/blog']);?></li> <li><?=Html::a(\Yii::t('menu', 'Blog'), ['/blog']);?></li>
<!-- <li><?=Html::a(\Yii::t('menu', 'Analytics school'), ['/school']);?></li> -->
<li><?=Html::a(\Yii::t('menu', 'Contacts'), ['/contacts']);?></li> <li><?=Html::a(\Yii::t('menu', 'Contacts'), ['/contacts']);?></li>
<!-- <li>--><?//=Html::a(\Yii::t('menu', 'Faq'), ['/faq']);?><!--</li>-->
</ul> </ul>
</nav> </nav>
<?= Languages::widget();?> <?= Languages::widget();?>
......
...@@ -1836,6 +1836,12 @@ a.keys_test_btn { ...@@ -1836,6 +1836,12 @@ a.keys_test_btn {
display: block; display: block;
} }
.keys_block_small.keys_block_small--auto {
display: block;
width: auto;
height: auto;
}
.attachment-button { .attachment-button {
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
...@@ -3503,6 +3509,10 @@ ul.list { ...@@ -3503,6 +3509,10 @@ ul.list {
padding-left: 40px; padding-left: 40px;
} }
ul.list li {
margin-bottom: 5px;
}
.category-preloader { .category-preloader {
display: none; display: none;
float: right; float: right;
...@@ -3621,6 +3631,125 @@ h3.block-chain-header { ...@@ -3621,6 +3631,125 @@ h3.block-chain-header {
z-index: 3; z-index: 3;
} }
.case-block {
margin-bottom: 50px;
}
.case-block h2 {
margin-bottom: 30px;
}
.dek_how_works {
margin-bottom: -120px;
}
@media only screen and (max-width: 991px) {
.dek_how_works {
margin-bottom: -80px;
}
}
.case {
height: 160px;
position: relative;
display: block;
margin-bottom: 20px;
box-shadow: 0 0 18px rgba(0,1,3,.26);
}
.case--crypto {
background: url("../images/crypto_case.png") no-repeat center;
background-size: cover;
}
.case--lizing {
background: url("../images/lizing_case.png") no-repeat center;
background-size: cover;
}
.case--lizing-ai {
background: url("../images/lizing_ai_case.png") no-repeat center;
background-size: cover;
}
.case:hover .case__footer {
background: #fff;
}
.case:hover .case-footer-title {
color: #2d3642;
}
.case:hover .case-details {
color: #4b78bb;
border: 2px solid #4b78bb;
}
.case .case-footer-title {
margin: 20px 0 0 20px;
color: #fff;
font-size: 20px;
line-height: 1.1;
font-family: "RobotoBold";
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
-webkit-transition: all .2s linear;
-ms-transition: all .2s linear;
transition: all .2s linear;
}
.case-details {
margin: 20px 20px 0 0;
display: none;
float: right;
color: #fff;
font-size: 16px;
padding: 0 10px;
border: 2px solid #fff;
text-align: center;
line-height: 27px;
border-radius: 50px;
-moz-border-radius: 50px;
-webkit-border-radius: 50px;
-o-border-radius: 50px;
-ms-border-radius: 50px;
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
-webkit-transition: all .2s linear;
-ms-transition: all .2s linear;
transition: all .2s linear;
}
.case:hover .case-details:after {
background: url(../images/icon/keys_small_btn_more-hover.png) no-repeat;
}
.case-details:after {
content: "";
background: url(../images/icon/keys_small_btn_more.png) no-repeat;
width: 8px;
height: 17px;
display: inline-block;
vertical-align: middle;
margin-left: 15px;
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
-webkit-transition: all .2s linear;
-ms-transition: all .2s linear;
transition: all .2s linear;
}
.case__footer {
width: 100%;
height: 70px;
position: absolute;
bottom: 0;
left: 0;
background: rgba(36,51,64,.56);
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
-webkit-transition: all .2s linear;
-ms-transition: all .2s linear;
transition: all .2s linear;
}
@media only screen and (max-width: 1600px) and (min-width: 1301px){ @media only screen and (max-width: 1600px) and (min-width: 1301px){
...@@ -3653,7 +3782,6 @@ h3.block-chain-header { ...@@ -3653,7 +3782,6 @@ h3.block-chain-header {
} }
} }
@media only screen and (max-width: 767px){ @media only screen and (max-width: 767px){
.blockchain_title_logo{ .blockchain_title_logo{
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -3671,8 +3799,16 @@ h3.block-chain-header { ...@@ -3671,8 +3799,16 @@ h3.block-chain-header {
@media only screen and (min-width: 768px) { @media only screen and (min-width: 768px) {
.case-details {
display: block;
}
.case .case-footer-title {
font-size: 24px;
line-height: 33px;
}
.block-chain { .block-chain {
background: url(/images/block_chain.png) no-repeat left top; background: url(../images/block_chain.png) no-repeat left top;
} }
.block-chain-item { .block-chain-item {
......
...@@ -140,19 +140,28 @@ u { ...@@ -140,19 +140,28 @@ u {
padding-left: 90px; padding-left: 90px;
} }
.benefit-item.benefit-icon-1 { .benefit-item.benefit-icon-1 {
background: url(/images/benefit_icon_1.png) no-repeat 10px top; background: url(../images/benefit_icon_1.png) no-repeat 10px top;
} }
.benefit-item.benefit-icon-2 { .benefit-item.benefit-icon-2 {
background: url(/images/benefit_icon_2.png) no-repeat 10px top; background: url(../images/benefit_icon_2.png) no-repeat 10px top;
} }
.benefit-item.benefit-icon-3 { .benefit-item.benefit-icon-3 {
background: url(/images/benefit_icon_3.png) no-repeat 10px top; background: url(../images/benefit_icon_3.png) no-repeat 10px top;
} }
.benefit-item.benefit-icon-4 { .benefit-item.benefit-icon-4 {
background: url(/images/benefit_icon_4.png) no-repeat 10px top; background: url(../images/benefit_icon_4.png) no-repeat 10px top;
} }
.benefit-item.benefit-icon-5 { .benefit-item.benefit-icon-5 {
background: url(/images/benefit_icon_5.png) no-repeat 10px top; background: url(../images/benefit_icon_5.png) no-repeat 10px top;
}
.benefit-item.benefit-icon-bank {
background: url(../images/benefit_bank.png) no-repeat 10px top;
}
.benefit-item.benefit-icon-finance {
background: url(../images/benefit_finance.png) no-repeat 10px top;
}
.benefit-item.benefit-icon-micro-finance {
background: url(../images/benefit_micro_finance.png) no-repeat 10px top;
} }
} }
...@@ -256,7 +265,7 @@ a.logo { ...@@ -256,7 +265,7 @@ a.logo {
font-size: 15px; font-size: 15px;
display: block; display: block;
float: left; float: left;
padding: 0px 8px; padding: 0px 7px;
height: 38px; height: 38px;
line-height: 34px; line-height: 34px;
border: 2px solid transparent; border: 2px solid transparent;
...@@ -11069,6 +11078,16 @@ h6 { ...@@ -11069,6 +11078,16 @@ h6 {
-ms-transition: all 0.2s linear; -ms-transition: all 0.2s linear;
transition: all 0.2s linear; transition: all 0.2s linear;
} }
.keys_small_btn_more.keys_small_btn_more--right {
float: right;
margin-left: 0;
margin-right: 23px;
}
.keys_block_small:hover .keys_small_foot .keys_small_title, .keys_block_big:hover .keys_small_foot .keys_small_title {
color: #2d3642;
}
.keys_block_small .keys_small_btn_more:hover, .keys_block_small .keys_small_btn_more:focus { .keys_block_small .keys_small_btn_more:hover, .keys_block_small .keys_small_btn_more:focus {
text-decoration: none; text-decoration: none;
} }
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
left: 0; left: 0;
width: 100%; width: 100%;
height: 370px; height: 370px;
background: url(/img/new_figure.png) no-repeat; background: url(../img/new_figure.png) no-repeat;
background-size: cover; background-size: cover;
background-position: center; background-position: center;
} }
......
This diff is collapsed.
$( document ).ready(function() {
$(".appl_api_section .img_list_wrap").each(function(index,el){
var id = $(el).attr("id");
$("#" + id).find(".img_list").after("<ul class='img_list_resp_box'></ul>");
$("#" + id).find(".img_list_resp_box").append($("#" + id).find(".img_list").html());
});
});
\ No newline at end of file
$(document).ready(function () {
$(".appl_api_section .img_list_wrap").each(function (index, el) {
var id = $(el).attr("id");
$("#" + id).find(".img_list").after("<ul class='img_list_resp_box'></ul>");
$("#" + id).find(".img_list_resp_box").append($("#" + id).find(".img_list").html());
});
if ($('.point_img_box').length) {
$(".point_img_box").each(function (index, el) {
var ind = index + 1;
$(this).attr('id', 'point_img_box' + ind);
var id = $(el).attr("id");
$("#" + id).find(".point_img_box_wr").after("<ul class='point_img_list_resp'></ul>");
$("#" + id).find(".point_img_list_resp").append($("#" + id).find(".point_img_list").html());
});
}
$(".youtube").each(function () {
// Based on the YouTube ID, we can easily find the thumbnail image
$(this).css('background-image', 'url(http://i.ytimg.com/vi/' + this.id + '/sddefault.jpg)');
// Overlay the Play icon to make it look like a video player
$(this).append($('<div/>', {'class': 'play'}));
$(document).delegate('#' + this.id, 'click', function () {
// Create an iFrame with autoplay set to true
var iframe_url = "https://www.youtube.com/embed/" + this.id + "?autoplay=1&autohide=1";
if ($(this).data('params')) iframe_url += '&' + $(this).data('params');
// The height and width of the iFrame should be the same as parent
var iframe = $('<iframe/>', {
'frameborder': '0',
'src': iframe_url,
'width': $(this).width(),
'height': $(this).height()
});
// Replace the YouTube thumbnail with YouTube HTML5 Player
$(this).replaceWith(iframe);
});
});
});
\ No newline at end of file
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