Commit 6593aea0001d6585bc33df3764d19bc3cd2d264a
1 parent
59ffcd46
поправил ошибки с мержем, и футером
Showing
2 changed files
with
4 additions
and
6 deletions
Show diff stats
frontend/views/layouts/main.php
| ... | ... | @@ -139,7 +139,7 @@ |
| 139 | 139 | </div> |
| 140 | 140 | |
| 141 | 141 | <div class="hidden-xs btn-header-wr"> |
| 142 | - <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Make an appointment') ?></span> | |
| 142 | + <span class="btn_ modal-link" data-form="write-to"><?=\Yii::t('app', 'Make an appointment') ?></span> | |
| 143 | 143 | </div> |
| 144 | 144 | |
| 145 | 145 | <ul class="hidden-xs hidden-sm"> |
| ... | ... | @@ -369,7 +369,7 @@ |
| 369 | 369 | </div> |
| 370 | 370 | <div class="row"> |
| 371 | 371 | <div class="col-xs-12 col-sm-12 studio-wrapp"> |
| 372 | - <div class="all-rights-txt">©<?=\Yii::t('app','All rights reserved');?> , 2018. ABClinic</div> | |
| 372 | + <div class="all-rights-txt">© <?=\Yii::t('app','All rights reserved');?> , 2018. ABClinic</div> | |
| 373 | 373 | <div class="link-studio"> |
| 374 | 374 | <a href="http://artweb.ua"><?=\Yii::t('app','Creating sites');?></a> |
| 375 | 375 | </div> | ... | ... |
frontend/views/site/index.php
| ... | ... | @@ -126,11 +126,9 @@ JS; |
| 126 | 126 | <div class="hidden-xs col-sm-5 col-md-5 col-lg-5"></div> |
| 127 | 127 | <div class="col-sm-7 col-md-7 col-lg-7"> |
| 128 | 128 | <div class="style box3-text-wr"> |
| 129 | -<<<<<<< HEAD | |
| 129 | + | |
| 130 | 130 | <h1 class="box3-text-title"><?=$seo->h1?></h1> |
| 131 | -======= | |
| 132 | - <div class="box3-text-title"><?=\Yii::t('app','ABC short')?></div> | |
| 133 | ->>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f | |
| 131 | + | |
| 134 | 132 | <div class="hidden-sm hidden-md hidden-lg row box3-img-hidden-wrapp"> |
| 135 | 133 | <img class="box3-img-hidden" src="images/box-3/box3.jpg" alt=""> |
| 136 | 134 | </div> | ... | ... |