Merge branch 'master' of http://47.99.244.21:9999/root/joshine

app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml

@@ -21,16 +21,16 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
 <?php if ($block->hasSpecialPrice()) :?>
 <?php if ($block->hasSpecialPrice()) :?>
     <span class="special-price">
     <span class="special-price">
         <?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
         <?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
-            'display_label'     => __('Special Price'),
+            'display_label'     => '',
             'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
             'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
             'price_type'        => 'finalPrice',
             'price_type'        => 'finalPrice',
-            'include_container' => true,
+            'include_container' => false,
             'schema' => $schema
             'schema' => $schema
         ]); ?>
         ]); ?>
     </span>
     </span>
     <span class="old-price">
     <span class="old-price">
         <?= /* @noEscape */ $block->renderAmount($priceModel->getAmount(), [
         <?= /* @noEscape */ $block->renderAmount($priceModel->getAmount(), [
-            'display_label'     => __('Regular Price'),
+            'display_label'     => '',
             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
             'price_type'        => 'oldPrice',
             'price_type'        => 'oldPrice',
             'include_container' => true,
             'include_container' => true,

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -68,14 +68,14 @@
   display: block !important;
   display: block !important;
 }
 }
 
 
-.old-price  > span .price-label{
-  display: none;
-}
-
-.old-price #old-price-1 > span{
-  text-decoration: line-through;
-  font-size: large;
-}
+//.old-price  > span .price-label{
+//  display: none;
+//}
+//
+//.old-price #old-price-1 > span{
+//  text-decoration: line-through;
+//  font-size: large;
+//}
 
 
 
 
 @media (max-width: 767px){
 @media (max-width: 767px){
@@ -372,9 +372,9 @@ footer a{
     width: 100%;
     width: 100%;
 }
 }
 
 
-.old-price{
-    float: left;
-}
+//.old-price{
+//    float: left;
+//}
 
 
 ul {
 ul {
     list-style: none;
     list-style: none;
@@ -459,5 +459,20 @@ ul {
 	}
 	}
 }
 }
 
 
+.price-final_price .price{
+  font-size: 14px;
+  margin-top: 0px;
+  position: relative;
+  z-index: 2;
+  color: #c60101;
+  display: inline-block;
+  font-weight: normal;
+  font-family: Outfit-Regular, sans-serif;
+}
 
 
-
+.price-final_price .old-price .price{
+  color: #999999;
+  text-decoration: line-through;
+  font-weight: 400;
+  margin-left: 5px;
+}
\ No newline at end of file