Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml

@@ -496,7 +496,7 @@ $full_free_ship = $_helper->currency($full_free, true, false);
             height: 100%;
         }
         .checkout-index-index .page-wrapper a.logo{
-            margin-left: 35%!important;
+            margin-left: 0px!important;
         }
         .checkout-index-index div#checkout {
             margin-top: 1rem;
@@ -542,9 +542,15 @@ $full_free_ship = $_helper->currency($full_free, true, false);
             display: inline-block;
             text-align: right;
         }
+        .checkout-index-index #opc-sidebar .table-totals .totals.discount .amount .price{
+            color:#ff373c;
+        }
 
         /***************payment end******************/
     }
+    .checkout-index-index .payment-method-title label.label .action.action-help span {
+        display: none;
+    }
     #checkout_place_order .fix-content .now-order-total{
         display:none;
     }
@@ -798,6 +804,78 @@ $full_free_ship = $_helper->currency($full_free, true, false);
             border-bottom: 1px solid #dcdcdc !important;
         }
     }
+    /************************************* top logo style start******************************************************/
+    @media(max-width:768px){
+        .checkout-index-index .secure-span{
+            display:inline-block;
+        }
+        .checkout-index-index .show-logo{
+            width:100%;
+            margin:0 auto!important;
+        }
+        .checkout-index-index .show-logo img{
+            vertical-align: middle;
+        }
+        .checkout-index-index .show-logo .secure-span .cut-span{
+            font-size:30px;
+            vertical-align: middle;
+            margin-left:0.5rem;
+            font-weight: lighter;
+            color:#777;
+        }
+        .checkout-index-index .show-logo .site-logo{
+            width:100px;
+        }
+        .checkout-index-index .show-logo .secure-span .logo-secure{
+            width:25px;min-width: 0px;
+        }
+        .checkout-index-index .show-logo .secure-span .cut-font{
+            color:#6fab83;
+            font-size: 15px;
+            vertical-align: text-top;
+            margin-left:0.5rem;
+        }
+        .checkout-index-index .header.content{
+            text-align: center;
+        }
+    }
+    @media(min-width:768px){
+        .checkout-index-index .secure-span{
+            display:inline-block;
+        }
+        .checkout-index-index .show-logo{
+            width:35%;
+        }
+        .checkout-index-index .show-logo img{
+            vertical-align: middle;
+        }
+        .checkout-index-index .show-logo .secure-span .cut-span{
+            font-size:50px;
+            vertical-align: text-bottom;
+            margin-left:0.9rem;
+            font-weight: lighter;
+            color:#777;
+        }
+        .checkout-index-index .show-logo .site-logo{
+            width:198px;
+        }
+        .checkout-index-index .show-logo .secure-span .logo-secure{
+            width:45px;min-width: 0px;
+        }
+        .checkout-index-index .show-logo .secure-span .cut-font{
+            color:#6fab83;
+            font-size: 26px;
+            vertical-align: text-top;
+            margin-left:0.5rem;
+        }
+        .checkout-index-index .page-header .header.content .logo{
+            left:35%;
+        }
+    }
+    /************************************* top logo style end******************************************************/
+
+
+
 </style>
 <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
     <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>

app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/header/logo.phtml

@@ -53,17 +53,28 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
 
 
 </script>
-
+<style>
+    .secure-span{
+        display:none;
+    }
+</style>
 <span data-action="toggle-nav" class="action nav-toggle"><span><?= $block->escapeHtml(__('Toggle Nav')) ?></span></span>
 <a
-        class="logo"
+        class="logo show-logo"
         href="<?= $block->escapeUrl($block->getUrl('')) ?>"
         title="<?= $block->escapeHtmlAttr($storeName) ?>"
         aria-label="store logo">
-    <img src="<?= $block->escapeUrl($block->getLogoSrc()) ?>"
+    <img class="site-logo" src="<?= $block->escapeUrl($block->getLogoSrc()) ?>"
          title="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
          alt="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
         <?= $logoWidth ? 'width="' . $block->escapeHtmlAttr($logoWidth) . '"' : '' ?>
         <?= $logoHeight ? 'height="' . $block->escapeHtmlAttr($logoHeight) . '"' : '' ?>
     />
+    <span class="secure-span">
+        <span class="cut-span" >
+        /
+        </span>
+        <img class="logo-secure" src="/media/wysiwyg/logo-secure.png" />
+        <span class="cut-font">SECURE CHECKOUT</span>
+    </span>
 </a>