Administrator / test_3

Commit f86df65236736ad4b22568a48786a323359e8444

Authored by Yarik
2 parents 8eab7c9f d85e2181

Merge remote-tracking branch 'origin/master'

Showing 7 changed files with 42 additions and 13 deletions   Show diff stats
Inline Side-by-side
frontend/views/bookmarks/bookmarks-customer.php
  Show/Hide comments   View file @f86df65
... ... @@ -21,7 +21,7 @@
21 21 <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
22 22 <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
23 23 <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
24   - <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
  24 + <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
25 25 </div>
26 26 <div class="right-search-work">
27 27 <div class="search-worker-title style"><span>Заказчики</span></div>
... ...
frontend/views/bookmarks/bookmarks-performer.php
  Show/Hide comments   View file @f86df65
... ... @@ -21,7 +21,7 @@
21 21 <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
22 22 <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
23 23 <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
24   - <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
  24 + <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
25 25 </div>
26 26 <div class="right-search-work">
27 27 <div class="search-worker-title style"><span>Исполнители</span></div>
... ...
frontend/views/bookmarks/bookmarks-project.php
  Show/Hide comments   View file @f86df65
... ... @@ -21,7 +21,7 @@
21 21 <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
22 22 <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
23 23 <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
24   - <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
  24 + <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
25 25 </div>
26 26 <div class="right-search-work">
27 27 <div class="search-worker-title style"><span><?=Yii::t('app', 'Projects')?></span></div>
... ...
frontend/views/bookmarks/bookmarks-vacancy.php
  Show/Hide comments   View file @f86df65
... ... @@ -21,7 +21,7 @@
21 21 <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
22 22 <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
23 23 <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
24   - <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
  24 + <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
25 25 </div>
26 26 <div class="right-search-work">
27 27 <div class="search-worker-title style"><span>Вакансии</span></div>
... ...
frontend/views/bookmarks/bookmarks.php
  Show/Hide comments   View file @f86df65
... ... @@ -12,7 +12,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
12 12 <a href="#" class="search-performer-button-performers">Исполнители</a>
13 13 <a href="#" class="search-performer-button-customers">Заказчики</a>
14 14 <a href="#" class="search-performer-button-project"><?=Yii::t('app', 'Projects')?></a>
15   - <a href="#" class="search-performer-button-project">Вакансии</a>
  15 + <a href="#" class="search-performer-button-vacant_">Вакансии</a>
16 16 </div>
17 17 <div class="right-search-work">
18 18 <div class="search-worker-title style"><span>Исполнители</span></div>
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @f86df65
... ... @@ -420,7 +420,7 @@ ul.main-menu li span:after{
420 420 /*min-height: 322px;*/
421 421 height: 323px;
422 422 position: relative;
423   - overflow: hidden;
  423 + /*overflow: hidden;*/
424 424 margin-top: 23px;
425 425 border-top: 1px solid #dfdfdf;
426 426 border-bottom: 1px solid #dfdfdf;
... ... @@ -444,11 +444,13 @@ ul.content-menu-first li {
444 444 transition: 0.3s;
445 445 background: #fff;
446 446 }
447   -ul.content-menu-first li:first-child {border-top: 0}
  447 +ul.content-menu-first > li:first-child { border-top-left-radius: 4px;}
  448 +ul.content-menu-first > li:last-child, ._fix_radius_ {border-bottom-left-radius: 4px;}
448 449 ul.content-menu-first li:hover {
449 450 background: #bb0f3f;
  451 + transition: 0s;
450 452 }
451   -
  453 +ul.content-menu-first li:first-child {border-top: 0}
452 454 ul.content-menu-first li a {
453 455 text-decoration: none;
454 456 color: #333333;
... ... @@ -484,6 +486,7 @@ ul.content-menu-first li ul li:hover a {
484 486 }
485 487 ul.content-menu-first li > ul li{box-sizing: border-box;padding-left: 19px}
486 488 ul.content-menu-first li > ul li a{color: #fff !important}
  489 +
487 490 .remove-link, .remove-link-two {position: relative}
488 491 .hack-arrow {
489 492 width: 6px;
... ... @@ -503,7 +506,7 @@ ul.content-menu-first li &gt; ul li a{color: #fff !important}
503 506 /*background: url("/images/arrow-menu-two.png") no-repeat;*/
504 507 /*}*/
505 508 li.hov-arrow:after{ background: url("/images/arrow-menu-two-hov.png") no-repeat !important;}
506   -ul.third-ul-menu{display: none !important;}
  509 +ul.third-ul-menu{display: none !important; margin-left: -1px}
507 510 ul.content-menu-first li ul li:hover ul.third-ul-menu{display: block !important;}
508 511 .third-ul-menu li:last-child{border-bottom: 1px solid #dfdfdf;}
509 512 ul.last-ul-menu{display: none!important;}
... ... @@ -511,7 +514,13 @@ ul.last-ul-menu{display: none!important;}
511 514 .last-ul-menu li{border-right: none !important}
512 515 ul.third-ul-menu li:hover ul.last-ul-menu {display: block !important;}
513 516 ul.content-menu-first li ul li:last-child, ul.content-menu-first li:last-child{border-bottom: 1px solid #dfdfdf;}
514   -ul.third-ul-menu li {background: #fff !important; height: auto; line-height: 18px; min-height: 36px; padding: 9px 0 8px 0;}
  517 +ul.third-ul-menu li {background: #fff !important;border-left: 1px solid #dfdfdf;}
  518 +ul.content-menu-first li > ul li {
  519 + height: auto;
  520 + line-height: 18px;
  521 + min-height: 36px;
  522 + padding: 9px 16px 8px 19px;
  523 +}
515 524 ul.third-ul-menu li:after{margin-top: -13px; }
516 525 /*ul.third-ul-menu li:after{margin-top: -13px; height: 100% !important; background: red !important;}*/
517 526 /***************************/
... ... @@ -3603,7 +3612,7 @@ form.offer-project {
3603 3612 height: 52px;
3604 3613 top: -16px;
3605 3614 }
3606   -.search-performer-button-performers, .search-performer-button-customers, .search-performer-button-project {
  3615 +.search-performer-button-performers, .search-performer-button-customers, .search-performer-button-project, .search-performer-button-vacant_ {
3607 3616 width: 170px;
3608 3617 height: 43px;
3609 3618 line-height: 45px;
... ... @@ -3632,6 +3641,21 @@ form.offer-project {
3632 3641 background: linear-gradient(to bottom, #f8941e 0%,#fd9d2b 100%);
3633 3642 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8941e', endColorstr='#fd9d2b',GradientType=0 );
3634 3643 }
  3644 +.search-performer-button-vacant_ {
  3645 + border-bottom: 2px solid #692767;
  3646 + background: #a764a7;
  3647 + background: -moz-linear-gradient(top, #a764a7 0%, #854e87 100%);
  3648 + background: -webkit-linear-gradient(top, #a764a7 0%,#854e87 100%);
  3649 + background: linear-gradient(to bottom, #a764a7 0%,#854e87 100%);
  3650 + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a764a7', endColorstr='#854e87',GradientType=0 );
  3651 +}
  3652 +.search-performer-button-vacant_:hover {
  3653 + background: #854e87;
  3654 + background: -moz-linear-gradient(top, #854e87 0%, #a764a7 100%);
  3655 + background: -webkit-linear-gradient(top, #854e87 0%,#a764a7 100%);
  3656 + background: linear-gradient(to bottom, #854e87 0%,#a764a7 100%);
  3657 + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#854e87', endColorstr='#a764a7',GradientType=0 );
  3658 +}
3635 3659 .search-performer-button-customers {
3636 3660 border-bottom: 2px solid #3e9825;
3637 3661 background: #6bcb50;
... ... @@ -6924,5 +6948,4 @@ li.active-menu-admin:hover a .ico_num {
6924 6948 width: 100%;
6925 6949 float: left;
6926 6950 margin-bottom: 16px;
6927   -}
6928   -
  6951 +}
6929 6952 \ No newline at end of file
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @f86df65
... ... @@ -28,6 +28,7 @@ $(document).ready(
28 28 featuresTags();
29 29 inputNumber();
30 30 videoFull();
  31 + fixMenuRadius()
31 32 function resizeWindow()
32 33 {
33 34 $(window).resize(
... ... @@ -1263,5 +1264,10 @@ $(document).ready(
1263 1264 return false;
1264 1265 }
1265 1266 });
  1267 + function fixMenuRadius() {
  1268 + var newRadius = $('.content-menu-first > li')
  1269 + var radiusLenght = (newRadius.length)-1
  1270 + $(newRadius[radiusLenght]).addClass('_fix_radius_')
  1271 + }
1266 1272 }
1267 1273 );
1268 1274 \ No newline at end of file
... ...