Anastasia / clinica

Commit 00ca844e62200f41a096f8dc847ccdd3159c392b

Authored by Alex Savenko
2 parents aec41363 6593aea0

merge error

Showing 3 changed files with 9 additions and 2 deletions   Show diff stats
Inline Side-by-side
clinica @ 8b1b0efde22
  1 +Subproject commit 8b1b0efde228ff71e43eba90086e0c15392645cc
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @00ca844
... ... @@ -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
  Show/Hide comments   View file @00ca844
... ... @@ -127,10 +127,16 @@ JS;
127 127 <div class="col-sm-7 col-md-7 col-lg-7">
128 128 <div class="style box3-text-wr">
129 129 <<<<<<< HEAD
  130 +<<<<<<< HEAD
130 131 <h1 class="box3-text-title"><?=$seo->h1?></h1>
131 132 =======
132 133 <div class="box3-text-title"><?=\Yii::t('app','ABC short')?></div>
133 134 >>>>>>> d9c166d79d2f2d83bd6f8ed4519df3d4c81e1f2f
  135 +=======
  136 +
  137 + <h1 class="box3-text-title"><?=$seo->h1?></h1>
  138 +
  139 +>>>>>>> 6593aea0001d6585bc33df3764d19bc3cd2d264a
134 140 <div class="hidden-sm hidden-md hidden-lg row box3-img-hidden-wrapp">
135 141 <img class="box3-img-hidden" src="images/box-3/box3.jpg" alt="">
136 142 </div>
... ...