Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/web/css/style.css

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/web/css/style.css
Karnovsky A
2 parents c3d7bd92 53254ab5
Showing 2 changed files with 7 additions and 2 deletions Show diff stats
frontend/views/basket/index.php
frontend/web/css/style.css
@@ -40,7 +40,7 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
  
     <h1 class="basket_title_">Корзина</h1>
 <div class="ten"></div>
-<?= Html::a('Вернуться в каталог', ['/site/index'], ['class'=>'btn-success']) ?>
+
 <?php $form = ActiveForm::begin(['enableClientScript' => false]); ?>
 <div class="rightbar">
  <div class="form-order">
@@ -108,7 +108,9 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
  
  
  
-			</div><div class="both"></div>
+			</div>
+    <?= Html::a('Продолжить покупки', ['/site/index'], ['class'=>'btn-success cont_shopping']) ?>
+    <div class="both"></div>
  <?php ActiveForm::end(); ?>			
  
  
@@ -1278,6 +1278,9 @@ ul.product-special li.promo:after {
     width: 100%;
     float: left;
 }
+.basket_title_ {
+    text-align: center;
+}
 .product-thumb-video iframe {
     width: 260px;
     height: auto;