Merge remote-tracking branch 'origin/master'

Yarik
2 parents 8eab7c9f d85e2181
Showing 7 changed files with 42 additions and 13 deletions Show diff stats
frontend/views/bookmarks/bookmarks-customer.php
frontend/views/bookmarks/bookmarks-performer.php
frontend/views/bookmarks/bookmarks-project.php
frontend/views/bookmarks/bookmarks-vacancy.php
frontend/views/bookmarks/bookmarks.php
frontend/web/css/style.css
frontend/web/js/script.js
@@ -21,7 +21,7 @@
                     <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
                     <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
                     <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
-                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
+                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
                 </div>
                 <div class="right-search-work">
                     <div class="search-worker-title style"><span>Заказчики</span></div>
@@ -21,7 +21,7 @@
                     <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
                     <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
                     <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
-                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
+                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
                 </div>
                 <div class="right-search-work">
                     <div class="search-worker-title style"><span>Исполнители</span></div>
@@ -21,7 +21,7 @@
                     <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
                     <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
                     <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
-                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
+                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
                 </div>
                 <div class="right-search-work">
                     <div class="search-worker-title style"><span><?=Yii::t('app', 'Projects')?></span></div>
@@ -21,7 +21,7 @@
                     <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
                     <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
                     <?= Html::a(Yii::t('app', 'Projects'), [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
-                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
+                    <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-vacant_' ]) ?>
                 </div>
                 <div class="right-search-work">
                     <div class="search-worker-title style"><span>Вакансии</span></div>
@@ -12,7 +12,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                     <a href="#" class="search-performer-button-performers">Исполнители</a>
                     <a href="#" class="search-performer-button-customers">Заказчики</a>
                     <a href="#" class="search-performer-button-project"><?=Yii::t('app', 'Projects')?></a>
-                    <a href="#" class="search-performer-button-project">Вакансии</a>
+                    <a href="#" class="search-performer-button-vacant_">Вакансии</a>
                 </div>
                 <div class="right-search-work">
                     <div class="search-worker-title style"><span>Исполнители</span></div>
@@ -420,7 +420,7 @@ ul.main-menu li span:after{
     /*min-height: 322px;*/
     height: 323px;
     position: relative;
-    overflow: hidden;
+    /*overflow: hidden;*/
     margin-top: 23px;
     border-top: 1px solid #dfdfdf;
     border-bottom: 1px solid #dfdfdf;
@@ -444,11 +444,13 @@ ul.content-menu-first li {
     transition: 0.3s;
     background: #fff;
 }
-ul.content-menu-first li:first-child {border-top: 0}
+ul.content-menu-first > li:first-child { border-top-left-radius: 4px;}
+ul.content-menu-first > li:last-child, ._fix_radius_ {border-bottom-left-radius: 4px;}
 ul.content-menu-first li:hover {
     background: #bb0f3f;
+    transition: 0s;
 }
-
+ul.content-menu-first li:first-child {border-top: 0}
 ul.content-menu-first li a {
     text-decoration: none;
     color: #333333;
@@ -484,6 +486,7 @@ ul.content-menu-first li ul li:hover a {
 }
 ul.content-menu-first li > ul li{box-sizing: border-box;padding-left: 19px}
 ul.content-menu-first li > ul li a{color: #fff !important}
+
 .remove-link, .remove-link-two {position: relative}
 .hack-arrow {
     width: 6px;
@@ -503,7 +506,7 @@ ul.content-menu-first li &gt; ul li a{color: #fff !important}
 /*background: url("/images/arrow-menu-two.png") no-repeat;*/
 /*}*/
 li.hov-arrow:after{ background: url("/images/arrow-menu-two-hov.png") no-repeat !important;}
-ul.third-ul-menu{display: none !important;}
+ul.third-ul-menu{display: none !important; margin-left: -1px}
 ul.content-menu-first li ul li:hover ul.third-ul-menu{display: block !important;}
 .third-ul-menu li:last-child{border-bottom: 1px solid #dfdfdf;}
 ul.last-ul-menu{display: none!important;}
@@ -511,7 +514,13 @@ ul.last-ul-menu{display: none!important;}
 .last-ul-menu li{border-right: none !important}
 ul.third-ul-menu li:hover ul.last-ul-menu {display: block !important;}
 ul.content-menu-first li ul li:last-child, ul.content-menu-first li:last-child{border-bottom: 1px solid #dfdfdf;}
-ul.third-ul-menu li {background: #fff !important; height: auto; line-height: 18px; min-height: 36px; padding: 9px 0 8px 0;}
+ul.third-ul-menu li {background: #fff !important;border-left: 1px solid #dfdfdf;}
+ul.content-menu-first li > ul li {
+    height: auto;
+    line-height: 18px;
+    min-height: 36px;
+    padding: 9px 16px 8px 19px;
+}
 ul.third-ul-menu li:after{margin-top: -13px; }
 /*ul.third-ul-menu li:after{margin-top: -13px; height: 100% !important; background: red !important;}*/
 /***************************/
@@ -3603,7 +3612,7 @@ form.offer-project {
     height: 52px;
     top: -16px;
 }
-.search-performer-button-performers, .search-performer-button-customers, .search-performer-button-project {
+.search-performer-button-performers, .search-performer-button-customers, .search-performer-button-project, .search-performer-button-vacant_ {
     width: 170px;
     height: 43px;
     line-height: 45px;
@@ -3632,6 +3641,21 @@ form.offer-project {
     background: linear-gradient(to bottom,  #f8941e 0%,#fd9d2b 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8941e', endColorstr='#fd9d2b',GradientType=0 );
 }
+.search-performer-button-vacant_ {
+    border-bottom: 2px solid #692767;
+    background: #a764a7;
+    background: -moz-linear-gradient(top,  #a764a7 0%, #854e87 100%);
+    background: -webkit-linear-gradient(top,  #a764a7 0%,#854e87 100%);
+    background: linear-gradient(to bottom,  #a764a7 0%,#854e87 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a764a7', endColorstr='#854e87',GradientType=0 );
+}
+.search-performer-button-vacant_:hover {
+    background: #854e87;
+    background: -moz-linear-gradient(top,  #854e87 0%, #a764a7 100%);
+    background: -webkit-linear-gradient(top,  #854e87 0%,#a764a7 100%);
+    background: linear-gradient(to bottom,  #854e87 0%,#a764a7 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#854e87', endColorstr='#a764a7',GradientType=0 );
+}
 .search-performer-button-customers {
     border-bottom: 2px solid #3e9825;
     background: #6bcb50;
@@ -6924,5 +6948,4 @@ li.active-menu-admin:hover a .ico_num {
     width: 100%;
     float: left;
     margin-bottom: 16px;
-}
-
+}
 \ No newline at end of file
@@ -28,6 +28,7 @@ $(document).ready(
         featuresTags();
         inputNumber();
         videoFull();
+        fixMenuRadius()
         function resizeWindow()
         {
             $(window).resize(
@@ -1263,5 +1264,10 @@ $(document).ready(
                 return false;
             }
         });
+        function fixMenuRadius() {
+            var newRadius = $('.content-menu-first > li')
+            var radiusLenght = (newRadius.length)-1
+            $(newRadius[radiusLenght]).addClass('_fix_radius_')
+        }
     }
 );
 \ No newline at end of file