Merge remote-tracking branch 'origin/master'

Yarik
2 parents d001b40e b00243e6
Showing 3 changed files with 17 additions and 15 deletions Show diff stats
frontend/views/company/_company_list_view.php
frontend/views/layouts/main.php
frontend/web/css/style.css
@@ -28,6 +28,10 @@ $http_pattern = &#39;/^https?.*$/&#39;;
                 echo "<p>{$model->lastname}</p>";
             }
             ?>
+            <div class="command-block-line">
+                <div class="command-block-line-left"></div>
+                <div class="command-block-line-right"></div>
+            </div>
             <?php
             if(!empty( $model->department->name )) {
                 ?>
@@ -35,10 +39,6 @@ $http_pattern = &#39;/^https?.*$/&#39;;
             <?php
             }
             ?>
-            <div class="command-block-line">
-                <div class="command-block-line-left"></div>
-                <div class="command-block-line-right"></div>
-            </div>
         </div>
     </div>
 </div>
 \ No newline at end of file
@@ -38,7 +38,7 @@
         <div class="box-wr">
             <div class="box-all">
                 <a href="/"><img class="logo" src="/images/logo.png" width="100" height="68" alt=""/></a>
-                <div class="header-proektant-slogan">Международная Федерация Проектантов</div>
+                <div class="header-proektant-slogan">Международная Федерация Проектантов<br/>Engineers International Federation</div>
                 <ul class="header-contacts-menu">
                     <li>
                         <span><img src="/images/icon_question_01.png" alt=""/></span><?= Html::a('Задать вопрос', '', [ 'class' => 'contactsLinkModalFirst' ]) ?>
@@ -197,7 +197,7 @@ img.logo {
     width: 620px;
     padding: 23px 0 0 120px;
     box-sizing: border-box;
-    font-size: 28px;
+    font-size: 22px;
     line-height: 35px;
     float: left;
 }
@@ -908,7 +908,7 @@ li.project-home-active span {
 }
 .federation-home-text {
-    font-size: 18px;
+    font-size: 20px;
     color: #b7ebff;
     margin-top: 28px;
     box-sizing: border-box;
@@ -927,15 +927,15 @@ li.project-home-active span {
     max-height: 111px;
 }
 .new_txt_fed_home {
-    font-size: 13px;
+    font-size: 16px;
     text-align: center;
     color: #b7ebff;
     position: absolute;
-    top:27px;
+    top: 27px;
     left: 0;
-    max-height: 30px;
+    max-height: 50px;
     box-sizing: border-box;
-    padding: 0 162px;
+    padding: 0 155px;
     overflow: hidden;
 }
 .footer-all-wr {
@@ -8851,7 +8851,8 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 }
 .admin-avatar-pattern .remover_image#image_remove_img {
-    left: 180px !important;
+    left: 185px !important;
+    width: 12px;
 }
 .admin-avatar-pattern .remover_image#poster_remove_img {
@@ -12441,12 +12442,13 @@ li.active-menu-admin:hover a .ico_num {
     padding-left: 0 !important;
 }
 #modal_form_contacts .fileloader-item-remove:before {display:none;}
-.command-block-name {height: 50px;overflow: hidden; font-size: 16px;}
+.command-block-name {overflow: hidden; font-size: 16px;}
 .general_avatar-wr #image_remove_img {
     left: auto !important;
     right: -13px;
-    top: 50%;
-    margin-top: -9px;
+    top: 12%;
+    margin-top: -8px;
+    margin-left: 0px;
 }
 /* specialisations */