Administrator / test_3

Commit e84b6f0d14a66f0914fb20ee936a1856a5f7f593

Authored by Yarik
2 parents d001b40e b00243e6

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 17 additions and 15 deletions   Show diff stats
Inline Side-by-side
frontend/views/company/_company_list_view.php
  Show/Hide comments   View file @e84b6f0
... ... @@ -28,6 +28,10 @@ $http_pattern = '/^https?.*$/';
28 28 echo "<p>{$model->lastname}</p>";
29 29 }
30 30 ?>
  31 + <div class="command-block-line">
  32 + <div class="command-block-line-left"></div>
  33 + <div class="command-block-line-right"></div>
  34 + </div>
31 35 <?php
32 36 if(!empty( $model->department->name )) {
33 37 ?>
... ... @@ -35,10 +39,6 @@ $http_pattern = &#39;/^https?.*$/&#39;;
35 39 <?php
36 40 }
37 41 ?>
38   - <div class="command-block-line">
39   - <div class="command-block-line-left"></div>
40   - <div class="command-block-line-right"></div>
41   - </div>
42 42 </div>
43 43 </div>
44 44 </div>
45 45 \ No newline at end of file
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @e84b6f0
... ... @@ -38,7 +38,7 @@
38 38 <div class="box-wr">
39 39 <div class="box-all">
40 40 <a href="/"><img class="logo" src="/images/logo.png" width="100" height="68" alt=""/></a>
41   - <div class="header-proektant-slogan">Международная Федерация Проектантов</div>
  41 + <div class="header-proektant-slogan">Международная Федерация Проектантов<br/>Engineers International Federation</div>
42 42 <ul class="header-contacts-menu">
43 43 <li>
44 44 <span><img src="/images/icon_question_01.png" alt=""/></span><?= Html::a('Задать вопрос', '', [ 'class' => 'contactsLinkModalFirst' ]) ?>
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @e84b6f0
... ... @@ -197,7 +197,7 @@ img.logo {
197 197 width: 620px;
198 198 padding: 23px 0 0 120px;
199 199 box-sizing: border-box;
200   - font-size: 28px;
  200 + font-size: 22px;
201 201 line-height: 35px;
202 202 float: left;
203 203 }
... ... @@ -908,7 +908,7 @@ li.project-home-active span {
908 908 }
909 909  
910 910 .federation-home-text {
911   - font-size: 18px;
  911 + font-size: 20px;
912 912 color: #b7ebff;
913 913 margin-top: 28px;
914 914 box-sizing: border-box;
... ... @@ -927,15 +927,15 @@ li.project-home-active span {
927 927 max-height: 111px;
928 928 }
929 929 .new_txt_fed_home {
930   - font-size: 13px;
  930 + font-size: 16px;
931 931 text-align: center;
932 932 color: #b7ebff;
933 933 position: absolute;
934   - top:27px;
  934 + top: 27px;
935 935 left: 0;
936   - max-height: 30px;
  936 + max-height: 50px;
937 937 box-sizing: border-box;
938   - padding: 0 162px;
  938 + padding: 0 155px;
939 939 overflow: hidden;
940 940 }
941 941 .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-
8851 8851 }
8852 8852  
8853 8853 .admin-avatar-pattern .remover_image#image_remove_img {
8854   - left: 180px !important;
  8854 + left: 185px !important;
  8855 + width: 12px;
8855 8856 }
8856 8857  
8857 8858 .admin-avatar-pattern .remover_image#poster_remove_img {
... ... @@ -12441,12 +12442,13 @@ li.active-menu-admin:hover a .ico_num {
12441 12442 padding-left: 0 !important;
12442 12443 }
12443 12444 #modal_form_contacts .fileloader-item-remove:before {display:none;}
12444   -.command-block-name {height: 50px;overflow: hidden; font-size: 16px;}
  12445 +.command-block-name {overflow: hidden; font-size: 16px;}
12445 12446 .general_avatar-wr #image_remove_img {
12446 12447 left: auto !important;
12447 12448 right: -13px;
12448   - top: 50%;
12449   - margin-top: -9px;
  12449 + top: 12%;
  12450 + margin-top: -8px;
  12451 + margin-left: 0px;
12450 12452 }
12451 12453  
12452 12454 /* specialisations */
... ...