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

app/design/frontend/Joshine/breeze/Magento_LayeredNavigation/templates/layer/view.phtml

 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-?>
-<?php
-/**
  * Category layered navigation
  *
  * @var $block \Magento\LayeredNavigation\Block\Navigation
  */
 ?>
 
-<?php if ($block->canShowBlock()) : ?>
-    <div class="block filter">
-        <div class="block-content filter-content">
-            <?= $block->getChildHtml('state') ?>
-
-            <?php if ($block->getLayer()->getState()->getFilters()) : ?>
-                <div class="block-actions filter-actions">
-                    <a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $block->escapeHtml(__('Clear All')) ?></span></a>
-                </div>
-            <?php endif; ?>
-            <?php $wrapOptions = false; ?>
-            <?php foreach ($block->getFilters() as $filter) : ?>
-        <?php if (!$wrapOptions) : ?>
-            <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
-            <dl class="filter-options" id="narrow-by-list">
-                <?php $wrapOptions = true;
-                endif; ?>
-                <?php if ($filter->getItemsCount()) : ?>
-                    <dt role="heading" aria-level="3" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></dt>
-                    <dd class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></dd>
-                <?php endif; ?>
-                <?php endforeach; ?>
-                <?php if ($wrapOptions) : ?>
-            </dl>
+<?php if (!$block->canShowBlock()) : return; endif; ?>
+
+<?php
+    $visibleFilters = array_filter($block->getFilters(), function ($filter) {
+        return $filter->getItemsCount() > 0;
+    });
+    $activeFilters = $block->getLayer()->getState()->getFilters();
+
+    $isExpanded = $block->getExpanded();
+    if ($isExpanded === 'auto') {
+        $isExpanded = count($visibleFilters) <= 7;
+    }
+
+    $name = $block->getNameInLayout();
+    $parentName = $this->getLayout()->getParentName($name);
+    if (strpos($parentName, 'sidebar') === false) {
+        $isExpanded = false;
+    }
+?>
+
+<div class="block filter" data-mage-init='{"slideout":{"toggler":".filter-title","panel":".filter-content"}}'>
+    <div class="block-title filter-title" tabindex="0">
+        <strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
+        <?php if ($activeFilters) : ?>
+            <span class="count"><?= count($activeFilters) ?></span>
+        <?php endif; ?>
+    </div>
+
+    <div class="block-content filter-content">
+        <?= $block->getChildHtml('state') ?>
+
+        <?php if ($activeFilters) : ?>
+            <div class="block-actions filter-actions">
+                <a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $block->escapeHtml(__('Clear All')) ?></span></a>
+            </div>
+        <?php endif; ?>
+
+        <?php if ($visibleFilters) : ?>
+            <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><span><?= $block->escapeHtml(__('Shopping Options')) ?></span></strong>
+            <div class="filter-options" id="narrow-by-list">
+        <?php endif ?>
+
+        <?php foreach ($visibleFilters as $i => $filter) : ?>
+            <div class="filter-options-item filter-<?= $filter->getRequestVar() ?><?= $isExpanded ? ' initially-active active' : '' ?>"
+                data-mage-init='{"collapsible":{"active":<?= $isExpanded ? 'true' : 'false' ?>,"dialog":true}}'>
+                <div role="heading" aria-level="2" class="filter-options-title" data-trigger="true" data-role="title"><?= $block->escapeHtml(__($filter->getName())) ?></div>
+                <div class="filter-options-content" data-role="content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></div>
+            </div>
+        <?php endforeach; ?>
+
+        <?php if ($visibleFilters) : ?>
+            </div>
         <?php endif; ?>
-        </div>
     </div>
-<?php endif; ?>
+</div>

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

@@ -20,6 +20,7 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
     : $block->getLogoHeight();
 ?>
 
+
 <span data-action="toggle-nav" class="action nav-toggle"><span><?= $block->escapeHtml(__('Toggle Nav')) ?></span></span>
 <a
     class="logo"

app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/notices.phtml

@@ -68,7 +68,6 @@ script;
         </div>
     </div>
 <?php endif; ?>
-
 <div class="header_bar" >
 </div>
 <style>
@@ -86,7 +85,4 @@ script;
             background-size: 100%;
         }
     }
-</style>
-
-
-
+</style>
\ No newline at end of file

app/design/frontend/Joshine/breeze/Magento_Theme/web/js/theme.js

@@ -3,18 +3,18 @@
  * See COPYING.txt for license details.
  */
 
-define([
-    'jquery'
-], function ($, keyboardHandler) {
-    'use strict';
-    $("h4").click(function () {
-        var dis = $(this).siblings("ul").css("display");
-        if (dis == "none"){
-            $(this).siblings("ul").css("display","block");
-            $(this).children("span").html('^')
-        }else{
-            $(this).siblings("ul").css("display","none");
-            $(this).children("span").html('>')
-        }
-    })
+define(['jquery'], function($){
+    $(function () { // to ensure that code evaluates on page load
+        console.log('222');
+        $("h4").click(function () {
+            var dis = $(this).siblings("ul").css("display");
+            if (dis == "none"){
+                $(this).siblings("ul").css("display","block");
+                $(this).children("span").html('^')
+            }else{
+                $(this).siblings("ul").css("display","none");
+                $(this).children("span").html('>')
+            }
+        })
+    });
 });

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

@@ -66,3 +66,53 @@
   font-size: 20px;
 }
 
+.old-price  > span .price-label{
+  display: none;
+}
+
+.old-price #old-price-1 > span{
+  text-decoration: line-through;
+  font-size: large;
+}
+
+
+@media (max-width: 767px){
+  .box-tocart .fieldset .actions
+  {
+    position: fixed;
+    font-size: larger;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    margin: 0 auto;
+    left: 0;
+    right: 0;
+    padding: 0 10px;
+    background: #fff;
+    padding-top: 10px;
+
+  }
+  .box-tocart .fieldset .actions  > button{
+    width: 100%;
+  }
+  .block .block-content,#search_mini_form{
+    display: none;
+  }
+
+  .header.content{
+    gap: 3px;
+  }
+
+  .header.content > a{
+    margin-left: 15%;
+  }
+
+  .page-header {
+    position: fixed;
+  }
+  #maincontent .page-title-wrapper > h1{
+    display: none;
+  }
+}
+
+

app/design/frontend/Joshine/breeze/web/css/footer.css

+/*header */
+#maincontent  .page-title-wrapper > h1 > span{
+	display: none;
+}
+
+/* footer */
 *{
     padding: 0;
     margin: 0;
@@ -29,7 +35,8 @@ footer a{
 .footer_link ul li{
     margin-bottom: 20px;
 }
-@media screen and (max-width:1200px) {
+
+@media(max-width:789px) {
     .footer_link > div{
         width: 100%;
     }
@@ -64,8 +71,42 @@ footer a{
         display: none;
     }
 
+    #tab-label-description > a{
+        color: #222222;
+        font-weight: 500;
+        line-height: 1.35;
+        font-size: 1.09em;
+        margin-bottom: 0.69em;
+    }
+    .product attribute description,.product-info-main .product .attribute .overview{
+        font-size: small;
+        line-height: 25px;
+        color: #666666;
+    }
+
+    .page-wrapper .page-header{
+        background: #f2f2f2;
+        width: 100%;
+        padding-top: 0px;
+        margin-top: 0px;
+        position: fixed;
+        z-index: 11;
+    }
+
+    .breadcrumbs > ul .items {
+        width: max-content;
+    }
+    .maincontent 
+}
+
 
+.product.info .review-add + .review-list, .product.info #product-review-container {
+    float: left;
+    width: 100%;
+}
 
+.old-price{
+    float: left;
 }
 
 ul {
@@ -99,4 +140,12 @@ ul {
     padding: 10px;
     font-weight: bold;
 
-}
\ No newline at end of file
+}
+
+
+@media (max-width: 767px){
+    .block .block-search #search_mini_form {
+        display: none;
+    }
+}
+