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

app/code/Aitoc/Smtp/Model/Config.php

@@ -496,7 +496,8 @@ class Config
      */
      */
     public function isNewSender($version)
     public function isNewSender($version)
     {
     {
-        $currentVersion = $this->productMetadata->getVersion();
+        //$currentVersion = $this->productMetadata->getVersion();
+        $currentVersion = "2.4.3";
 
 
         return version_compare($currentVersion, $version, '>=');
         return version_compare($currentVersion, $version, '>=');
     }
     }

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/attribute.phtml

@@ -43,25 +43,13 @@ if ($_attributeType && $_attributeType == 'text') {
 } else {
 } else {
     $_attributeValue = $_helper->productAttribute($_product, $_product->$_call(), $_code);
     $_attributeValue = $_helper->productAttribute($_product, $_product->$_call(), $_code);
 }
 }
-
 ?>
 ?>
 
 
 <?php if ($_attributeValue) :?>
 <?php if ($_attributeValue) :?>
-<div class="product attribute <?= $block->escapeHtmlAttr($_className) ?>">
+    <div class="product attribute <?= $block->escapeHtmlAttr($_className) ?>">
         <?php if ($renderLabel) :?>
         <?php if ($renderLabel) :?>
             <strong class="type"><?= $block->escapeHtml($_attributeLabel) ?></strong>
             <strong class="type"><?= $block->escapeHtml($_attributeLabel) ?></strong>
         <?php endif; ?>
         <?php endif; ?>
-        <div class="value" <?= /* @noEscape */ $_attributeAddAttribute ?>>
-            <?php if($_attributeAddAttribute != 'itemprop="description"'): ?>
-                <?= /* @noEscape */ $_attributeValue ?>
-            <?php endif; ?>
+        <div class="value" <?= /* @noEscape */ $_attributeAddAttribute ?>><?= /* @noEscape */ $_attributeValue ?></div>
     </div>
     </div>
-</div>
 <?php endif; ?>
 <?php endif; ?>
-
-
-
-
-
-
-

app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml

@@ -93,11 +93,9 @@
             if (this._obj.btn){
             if (this._obj.btn){
                 $("<input type='button' id='left' value='<'>").css({
                 $("<input type='button' id='left' value='<'>").css({
                     left:0,
                     left:0,
-                    marginLeft:20
                 }).appendTo(this).
                 }).appendTo(this).
                     after($("<input type='button' id='right' value='>'>").css({
                     after($("<input type='button' id='right' value='>'>").css({
                         right:0,
                         right:0,
-                        marginRight:20
                     })).parent()
                     })).parent()
                     .children("input").css({
                     .children("input").css({
                     position:"absolute",
                     position:"absolute",

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

@@ -617,6 +617,9 @@ ul {
     grid-template-areas:
     grid-template-areas:
             "media title"
             "media title"
             "media main";
             "media main";
+    width: 80%;
+    margin-left: 10%;
+    margin-right: 10%;
   }
   }
 }
 }
 .product-info-wrapper .page-title span.base{
 .product-info-wrapper .page-title span.base{
@@ -1512,7 +1515,7 @@ footer{
   }
   }
 
 
   .flash_sale.news-arrivals{
   .flash_sale.news-arrivals{
-    margin-top: -100px;
+    margin-top: -75px;
   }
   }
 }
 }
 @media (min-width: 670px) {
 @media (min-width: 670px) {
@@ -1576,12 +1579,12 @@ button.action.submit.primary {
 .swatch-option::before {
 .swatch-option::before {
   content: '';
   content: '';
   position: absolute;
   position: absolute;
-  top: 0;
+  top: -3px;
   bottom: 0;
   bottom: 0;
-  left: 0;
+  left: -3px;
   right: 0;
   right: 0;
-  width: 40px;
-  height: 40px;
+  width: 46px;
+  height: 46px;
   border-radius: 50%;
   border-radius: 50%;
 }
 }