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

3a2c4f1b · lmf · 19841c07 · 0ce74771 · 3a2c4f1b · 3a2c4f1b
Commit 3a2c4f1b authored Oct 13, 2022 by lmf
Hide whitespace changes
Inline Side-by-side

Showing with 52 additions and 29 deletions

app/design/frontend/Joshine/breeze/Magento_Theme/layout/default.xml
+16 -8

app/design/frontend/Joshine/breeze/web/css/_custom.less
+36 -21

No files found.
--- a/app/design/frontend/Joshine/breeze/Magento_Theme/layout/default.xml
+++ b/app/design/frontend/Joshine/breeze/Magento_Theme/layout/default.xml
@@ -3,7 +3,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
    <body>
        <attribute name="class" value="breeze-theme"/>
-        <move element="top.search" destination="store.menu" after="catalog.topnav"/>
+        <move element="top.search" destination="nav.main.box" after="store.menu"/>
        <move element="skip_to_content" destination="header.panel" before="-"/>
        <referenceBlock name="cookie-status-check" remove="true"/>
@@ -38,7 +38,13 @@
        <referenceBlock name="catalog.compare.link" remove="true"/>
        <move element="top.links" destination="header.account"/>
        <move element="wishlist_sidebar" destination="header.wishlist"/>
+        <move element="header.search.bar" destination="header-wrapper" before="header.account"/>
        <referenceContainer name="header-wrapper">
+            <block class="Magento\Framework\View\Element\Text" name="header.search.bar">
+                <arguments>
+                    <argument name="text" xsi:type="string"><![CDATA[<div class="actions search-dropdown" data-role="minisearch-label"><a class="action toggle switcher-trigger" href="javascript:void(0);" title="search"><span class="abs-visually-hidden">search</span></a></div>]]></argument>
+                </arguments>
+            </block>
            <block class="Swissup\Breeze\Block\Theme\Dropdown" name="header.account">
                <arguments>
                    <argument name="title" xsi:type="string" translate="true">My Account</argument>
@@ -63,16 +69,18 @@
        <!-- Navigation -->
        <referenceBlock name="navigation.sections" remove="true"/>
        <referenceContainer name="page.top">
-            <container name="navigation.wrapper" before="-" htmlTag="div" htmlClass="navigation-wrapper">
+            <container name="nav.main.box" htmlClass="navigation-min-box" htmlTag="div">
-                <block class="Magento\Framework\View\Element\Text" name="navigation.close">
+                <container name="navigation.wrapper" before="-" htmlTag="div" htmlClass="navigation-wrapper">
-                    <arguments>
+                    <block class="Magento\Framework\View\Element\Text" name="navigation.close">
-                        <argument name="text" xsi:type="string"><![CDATA[<span data-action="toggle-nav" class="button-close" tabindex="0"></span>]]></argument>
+                        <arguments>
-                    </arguments>
+                            <argument name="text" xsi:type="string"><![CDATA[<span data-action="toggle-nav" class="button-close" tabindex="0"></span>]]></argument>
-                </block>
+                        </arguments>
+                    </block>
+                </container>
            </container>
        </referenceContainer>
 <!--        <move element="store.menu" destination="navigation.wrapper"/>-->
-         <move element="navigation.wrapper" destination="header.main.wrapper" after="-"/>
+         <move element="nav.main.box" destination="header.main.wrapper" after="-"/>
        <!-- Before Footer -->
        <referenceContainer name="page.bottom.container">

--- a/app/design/frontend/Joshine/breeze/web/css/_custom.less
+++ b/app/design/frontend/Joshine/breeze/web/css/_custom.less
@@ -964,6 +964,10 @@ footer{
  .page-header .actions.wishlist-dropdown{
    display: none;
  }
+  .page-header .actions.search-dropdown{
+    opacity: 0;
+    z-index: -1;
+  }
  .navigation .subchildmenu li{
    line-height: 36px;
  }
@@ -1098,25 +1102,49 @@ footer{
 //    display: none;
 //  }
 //}
+.navigation-min-box{
+  display: flex;
+  align-items: center;
+}
+.minisearch .control#search{
+  line-height: 30px;
+  height: 30px;
+  margin-top: 15px;
+}
+.minisearch .control .input-text{
+  border: 1px solid rgba(0,0,0,.1);
+  font-size: 12px;
+  font-family: sans-serif;
+}
+.block-search{
+  width: 20%;
+}
+:where(input:not([type=range])):focus, :where(input:not([type=range])):focus-visible, textarea:focus, textarea:focus-visible, select:focus, select:focus-visible{
+  --input-shadow-spread: 0;
+}
 .navigation-wrapper{
  padding-top: 10px;
  padding-bottom: 10px;
  //background: #f2f2f2;
  //border-top: 1px solid #e1e1e1;
  font-family: 'Outfit-Regular', sans-serif;
+  width: 79%;
+  margin: 0 auto;
  .nav-sections{
    background: transparent;
  }
  .navigation li{
    position: unset;
  }
  @media(min-width: 640px){
-    display: flex;
+    //display: flex;
-    align-items: center;
+    //align-items: center;
-    margin-left: 156px;
+    //margin-left: 156px;
+    .navigation{
+      margin-left: 2px;
+    }
    .navigation .active>a.level-top, .navigation .has-active>a.level-top{
      background:none;
@@ -1288,11 +1316,7 @@ footer{
      border: 3px solid transparent;
    }
-    .minisearch .control#search{
-      line-height: 30px;
-      height: 30px;
-      margin-top: 15px;
-    }
    //.minisearch .control .input-text,.minisearch .control .input-text:hover{
    //  border: none;
    //  border-bottom: 1px solid #000;
@@ -1303,21 +1327,12 @@ footer{
    //.minisearch .action.search{
    //  margin-left: -17rem;
    //}
-    .minisearch .control .input-text{
-      border: 1px solid rgba(0,0,0,.1);
-      font-size: 12px;
-      font-family: sans-serif;
-    }
-    .block-search{
-      width: 20%;
-    }
    .nav-sections{
      width: 77%;
      margin: 0 auto;
    }
-    :where(input:not([type=range])):focus, :where(input:not([type=range])):focus-visible, textarea:focus, textarea:focus-visible, select:focus, select:focus-visible{
-      --input-shadow-spread: 0;
-    }
    //.navigation li.level0.nav-1 .ui-menu-icon{
    //  position: absolute;