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

app/design/frontend/Joshine/breeze/Magento_Theme/requirejs-config.js

@@ -5,6 +5,6 @@
 
 var config = {
     deps: [
-        'Magento_Theme/js/public'
+
     ]
 };

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

@@ -39,26 +39,6 @@
     </div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'div.notice.global.site.local_storage') ?>
 
-    <?php $scriptString = <<<script
-
-require(['jquery'], function(jQuery){
-
-        // <![CDATA[
-        (function($) {
-            var test = 'test';
-            try {
-                localStorage.setItem(test, test);
-                localStorage.removeItem(test);
-            } catch(e) {
-                $(".notice.global.site.local_storage").show();
-            }
-        })(jQuery);
-        // ]]>
-
-});
-
-script;
-    ?>
     <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
 <?php if ($block->displayDemoNotice()): ?>

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

@@ -5,7 +5,6 @@
 
 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"){

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

@@ -177,7 +177,7 @@
     border: 0;
 }
 
-.swatch-option-link-layered > .swatch-option .color{
+.swatch-option-link-layered .swatch-option .color{
     position: unset;
     border-radius: 20px;
 } 

app/design/frontend/Joshine/breeze/web/js/breeze/custom.js

+(function () {
+    'use strict';
+    $(document).on('breeze:load', function () {
+        console.log('Hello');
+    });
+
+    //footer
+    $("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('>')
+        }
+    })
+})();
\ No newline at end of file

generated/.htaccess

+<IfVersion < 2.4>
+    order allow,deny
+    deny from all
+</IfVersion>
+<IfVersion >= 2.4>
+    Require all denied
+</IfVersion>
+