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 c9d723d7 bd6eefa5
Showing 2 changed files with 91 additions and 27 deletions Show diff stats
frontend/views/basket/index.php
frontend/web/css/style.css
@@ -121,10 +121,12 @@ $(&#39;#orders-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
  
  
  
-<div class="input-blocks-group textareagroup" style="border-bottom: none;">
+<div class="input-blocks-group textareagroup" style="border-bottom: none; padding-bottom: 0;">
     <?php echo $form->field($modelOrder,'body')->textarea(['rows'=>7]); ?>
+    <div class="checkout_basket">
+        <?php echo Html::submitButton(' Оформить заказ ',array('class'=>'submit4')); ?>
+    </div>
  
-    <?php echo Html::submitButton(' Оформить заказ ',array('class'=>'submit4')); ?>
 </div>
  
      <div class="both"></div>
@@ -157,18 +159,24 @@ $(&#39;#orders-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
 			</div>
 <?php endforeach;?>
  
-<?php echo Html::submitButton(' Пересчитать ',array('name'=>"update",'class'=>'submit4 fl')); ?>
+                <div style="margin-top: 10px;">
+                    <?php echo Html::submitButton(' Пересчитать ',array('name'=>"update",'class'=>'submit4 fl ')); ?>
+                </div>
+
  
 			<div class="total">
 			<?= $form->field($modelOrder, 'total')->hiddenInput(['value'=>$modelOrder->getSumCost()])->label(false); ?>
                             Общая сумма: <?=$modelOrder->getSumCost();?> грн.
 			</div>
-<div class="both"></div>			
+                <div class="cont_shopping-wr">
+                    <?= Html::a('Продолжить покупки', ['/site/index'], ['class'=>'btn-success cont_shopping']) ?>
+                </div>
+<div class="both"></div>
  
  
  
 			</div>
-    <?= Html::a('Продолжить покупки', ['/site/index'], ['class'=>'btn-success cont_shopping']) ?>
+
     <div class="both"></div>
  <?php ActiveForm::end(); ?>			
  
@@ -119,29 +119,46 @@ a.myorders{color:#f75d50}
 strike, strike span#old_cost{font-size:14px; color: #333}
  
  
-.submit4m, a.link_buy {
+.submit4m, a.link_buy, .checkout_basket button, .submit4 {
     background: #95ba2f;
     border-radius:4px;
     height: 29px;
-}
-a.link_buy {
+    text-transform: uppercase;
+    color:#ffffff;
+    text-decoration:none;
+    font-weight:600;
+    text-align:center;
+    border-bottom: 3px solid #799920;
     font-size: 12px;
+}
+.submit4.bottom3 {font-size: 12px !important;display: block;}
+.basket .submit4.bottom3 {font-size: 12px !important;display: block; margin-top: 10px;}
+a.link_buy, .checkout_basket button {
+
     display:block;
     margin:0 auto 10px auto;
     width:122px;
     line-height:32px;
-    text-transform: uppercase;color:#ffffff;
-    text-decoration:none;font-weight:600;
-    text-align:center;
-    border-bottom: 3px solid #799920;
 }
-a.link_buy:hover, .submit4m:hover {
+.checkout_basket button, .submit4{
+    margin: 0;
+    padding: 0 20px;
+    line-height: 31px;
+    width: auto;
+    border-top: 0;
+    border-left: 0;
+    border-right: 0;
+    cursor: pointer;
+}
+a.link_buy:hover, .submit4m:hover, .checkout_basket button:hover, .submit4:hover {
     border-bottom: 3px solid #95ba2f;;
 }
-a.link_buy:active, .submit4m:active {
+a.link_buy:active, .submit4m:active,.checkout_basket button:active, .submit4:active {
     background: #799920;
     border-bottom: 3px solid #799920;
+
 }
+.checkout_basket button:focus, .submit4:focus { outline: none;}
 .mycarousel{position:absolute;right:0;top:13px;}
 ul.mycarousel{list-style:none;margin:0px;padding:0px;}
 ul.mycarousel li{margin:0px;padding:0px;}
@@ -332,7 +349,7 @@ ul.product_colors li img{
 #modal_close{cursor:pointer;margin-top:-80px;margin-right:-50px;}
  
  
-.rightbar .control-label{float:left;width:80px;padding-top:5px;}
+.rightbar .control-label, .textareagroup .control-label {float:left;width:80px;padding-top:5px;}
 .form-control{outline:0;border:1px solid #d8d6d6;border-radius:5px;padding:5px 0px 5px 0px;font-size:14px;text-indent:10px;margin-bottom:3px;width:250px;}
 .form-control:focus {
     border:#1b9bb6 1px solid;
@@ -345,7 +362,7 @@ ul.product_colors li img{
 .basket_item{padding:10px 0px;border-bottom:1px solid #b7b7b7;clear: both}
 .basket_item img{margin-right:20px;}
 .basket_item .count{margin:20px 0px;}
-.basket_item  .fr{margin-top:5px;}
+.basket_item .fr{margin-top:13px;}
 .basket_item .info{overflow:hidden;}
 .basket_item > a{display: block;
     float: left;}
@@ -354,8 +371,8 @@ a.del:hover{color:#a52828;text-decoration: underline;}
  
 .total{text-align:right;color:#87476a;font-size:20px;margin:10px 0px;}
  
-.submit4{margin-top:5px;border:none;padding:8px 13px;background:#95ba2f;border-radius:5px;color:#ffffff;text-transform: uppercase;text-decoration:none;font-size:14px;cursor:pointer;}
-.submit4:hover{background:#f75d50;}
+/*.submit4{margin-top:5px;border:none;padding:8px 13px;background:#95ba2f;border-radius:5px;color:#ffffff;text-transform: uppercase;text-decoration:none;font-size:14px;cursor:pointer;}*/
+/*.submit4:hover{background:#f75d50;}*/
  
 .submit4m {font-family: Roboto;border:none;background:#95ba2f;border-radius:4px;color:#ffffff;text-transform: uppercase;font-size:10px;cursor:pointer; width:102px; height: 29px; border-bottom: 3px solid #799920; line-height: 29px;}
 .submit4m:active,.submit4m:focus {outline: none}
@@ -613,8 +630,8 @@ ul.social {margin-top: 20px;}
  
 .content_area{width:450px;}
  
-.bottom3{border-top:3px solid #95ba2f !important;border-bottom:3px solid #799920 !important; float:left;font-size:15px;}
-.bottom3:hover{border-top:3px solid #f75d50 !important;border-bottom:3px solid #c33327 !important;}
+/*.bottom3{border-top:3px solid #95ba2f !important;border-bottom:3px solid #799920 !important; float:left;font-size:15px;}*/
+/*.bottom3:hover{border-top:3px solid #f75d50 !important;border-bottom:3px solid #c33327 !important;}*/
 #cancel{text-decoration:none;color:#799920;font-size:13px;border-bottom:1px dotted #799920;float:left;margin-left:40px;}
  
 .buttons{
@@ -1096,7 +1113,7 @@ ul.product-special li.new {
 ul.product-special li.new:after {
     content: '';
     position: absolute;
-    left: 52px;
+    right: -19px;
     top: 3px;
     border: 11px solid transparent;
     border-top: 5px solid #42b9f6;
@@ -1275,13 +1292,21 @@ ul.product-special li.promo:after {
     padding: 0 13px;
     height: 28px;
 }
-.field-orders-delivery .control-label, .field-orders-payment .control-label, .field-orders-body .control-label, .control-label {
+.field-orders-delivery .control-label, .field-orders-payment .control-label, .field-orders-body .control-label, .textareagroup .control-label {
     width: 100%;
     float: left;
 }
 .basket_title_ {
     text-align: center;
 }
+.cont_shopping-wr {
+    width: 100%;
+    float: left;
+    margin-top: 10px;
+}
+.cont_shopping-wr .cont_shopping {
+    float: right;
+}
 .cont_shopping {
     display: block !important;
     border-top: 0!important;
@@ -1325,24 +1350,39 @@ ul.product-special li.promo:after {
 .custom-input-2 {
     width: 100%;
     height: 30px;
-    border: 1px solid #d2d2d2;
     box-sizing: border-box;
     outline: none;
-    color: #636363;
-    font-size: 13px;
     line-height: 30px;
     padding-left: 8px;
     margin-top: 5px;
     background: #fff;
     border-radius: 4px;
 }
+.custom-input-2, .custom-area-2, .textareagroup textarea {
+    border: 1px solid #d2d2d2;
+    box-sizing: border-box;
+    font-size: 13px;
+    color: #636363;
+}
+.custom-area-2, .textareagroup textarea {
+    min-height: 128px;
+    max-height: 128px;
+    resize: none;
+    width: 100%;
+    max-width: 100%;
+    outline: none;
+    padding-left: 8px;
+    padding-top: 8px;
+    margin-top: 8px;
+}
 .basket_input_2 .custom-input-2 {
     width: 270px;
     float: right;
     margin-top: 0;
 }
-.custom-input-2:focus, .custom-area-3:focus{box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s}
-.title_groups, .radio_grp label.control-label {
+.custom-input-2:focus, .custom-area-3:focus, .textareagroup textarea:focus {box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s}
+.textareagroup textarea:focus{border: 1px solid #d2d2d2;}
+.title_groups, .radio_grp label.control-label, .textareagroup .control-label {
     font-size: 12px;
     font-weight: bold;
     text-transform: uppercase;
@@ -1385,6 +1425,22 @@ input.custom-radio + label:hover {
     margin-top: 7px;
 }
 .custom-form-buttons:first-child {margin-top: 0}
+.delivery-data .field-order-delivery-childs .control-label {display: none;}
+.checkout_basket {
+    width: 100%;
+    float: left;
+}
+.checkout_basket button {
+    margin: 0 auto;
+}
+.input-blocks-wrapper .help-block {
+    padding-left: 71px;
+    padding-top: 5px;
+    width: 100%;
+    float: left;
+    box-sizing: border-box;
+    margin-bottom: 0;
+}
 .product-thumb-video iframe {
     width: 260px;
     height: auto;