Administrator / new_rukzachok-1

Commit 34b5f15ab280b051705e1a2d6e69a2e04c123525

Authored by Karnovsky A
2 parents c3d7bd92 53254ab5

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	frontend/web/css/style.css
Showing 2 changed files with 7 additions and 2 deletions   Show diff stats
Inline Side-by-side
frontend/views/basket/index.php
  Show/Hide comments   View file @34b5f15
@@ -40,7 +40,7 @@ $('#order-delivery input[type=\"radio\"]').click(function(){ @@ -40,7 +40,7 @@ $('#order-delivery input[type=\"radio\"]').click(function(){
40 40
41 <h1 class="basket_title_">Корзина</h1> 41 <h1 class="basket_title_">Корзина</h1>
42 <div class="ten"></div> 42 <div class="ten"></div>
43 -<?= Html::a('Вернуться в каталог', ['/site/index'], ['class'=>'btn-success']) ?> 43 +
44 <?php $form = ActiveForm::begin(['enableClientScript' => false]); ?> 44 <?php $form = ActiveForm::begin(['enableClientScript' => false]); ?>
45 <div class="rightbar"> 45 <div class="rightbar">
46 <div class="form-order"> 46 <div class="form-order">
@@ -108,7 +108,9 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){ @@ -108,7 +108,9 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
108 108
109 109
110 110
111 - </div><div class="both"></div> 111 + </div>
  112 + <?= Html::a('Продолжить покупки', ['/site/index'], ['class'=>'btn-success cont_shopping']) ?>
  113 + <div class="both"></div>
112 <?php ActiveForm::end(); ?> 114 <?php ActiveForm::end(); ?>
113 115
114 116
frontend/web/css/style.css
  Show/Hide comments   View file @34b5f15
@@ -1278,6 +1278,9 @@ ul.product-special li.promo:after { @@ -1278,6 +1278,9 @@ ul.product-special li.promo:after {
1278 width: 100%; 1278 width: 100%;
1279 float: left; 1279 float: left;
1280 } 1280 }
  1281 +.basket_title_ {
  1282 + text-align: center;
  1283 +}
1281 .product-thumb-video iframe { 1284 .product-thumb-video iframe {
1282 width: 260px; 1285 width: 260px;
1283 height: auto; 1286 height: auto;