Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branchs_developer

app/code/Joshine/FreeBar/etc/adminhtml/system.xml

 <?xml version="1.0"?>
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
     <system>
-        <tab id="freebar" translate="label" sortOrder="110">
-            <label>Joshine</label>
-        </tab>
         <section id="freebar" translate="label" type="text" sortOrder="320" showInDefault="1" showInWebsite="1" showInStore="1">
         <section id="freebar" translate="label" type="text" sortOrder="320" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Freebar</label>
             <label>Freebar</label>
-            <tab>freebar</tab>
+            <tab>joshine</tab>
             <resource>Joshine_FreeBar::config_system</resource>
             <resource>Joshine_FreeBar::config_system</resource>
             <group id="general" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="general" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label><![CDATA[Top free bars]]></label>
                 <label><![CDATA[Top free bars]]></label>

app/code/Magepow/Sizechart/etc/adminhtml/menu.xml

@@ -2,7 +2,7 @@
 
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
     <menu>
-        <update id="magepow" title="Magepow" module="Magepow_Sizechart" sortOrder="10" resource="Magepow_Sizechart::magepow" />
+        <update id="magepow" title="SizChart" module="Magepow_Sizechart" sortOrder="10" resource="Magepow_Sizechart::magepow" />
         <add id="Magepow_Sizechart::magepow" title="Size Chart" module="Magepow_Sizechart" sortOrder="10" parent="magepow" resource="Magepow_Sizechart::magepow" />
         <add id="Magepow_Sizechart::magepow" title="Size Chart" module="Magepow_Sizechart" sortOrder="10" parent="magepow" resource="Magepow_Sizechart::magepow" />
         <add id="Magepow_Sizechart::sizechart" title="Size Chart Management" module="Magepow_Sizechart" parent="Magepow_Sizechart::magepow" sortOrder="20" action="magepow_sizechart/sizechart" resource="Magepow_Sizechart::sizechart"/>
         <add id="Magepow_Sizechart::sizechart" title="Size Chart Management" module="Magepow_Sizechart" parent="Magepow_Sizechart::magepow" sortOrder="20" action="magepow_sizechart/sizechart" resource="Magepow_Sizechart::sizechart"/>
         <add id="Magepow_Sizechart::config" title="Configuration" module="Magepow_Sizechart" parent="Magepow_Sizechart::magepow" sortOrder="30" action="adminhtml/system_config/edit/section/magepow_sizechart" resource="Magepow_Sizechart::sizechart_configuration"/>
         <add id="Magepow_Sizechart::config" title="Configuration" module="Magepow_Sizechart" parent="Magepow_Sizechart::magepow" sortOrder="30" action="adminhtml/system_config/edit/section/magepow_sizechart" resource="Magepow_Sizechart::sizechart_configuration"/>

app/code/Magepow/Sizechart/etc/adminhtml/system.xml

 <?xml version="1.0"?>
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
     <system>
-        <tab id="magepow" translate="label" sortOrder="10">
-            <label>Magepow</label>
-        </tab>
         <section id="magepow_sizechart" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
         <section id="magepow_sizechart" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
             <class>separator-top</class>
             <class>separator-top</class>
             <label>Size Chart</label>
             <label>Size Chart</label>
-            <tab>magepow</tab>
+            <tab>joshine</tab>
             <resource>Magepow_Sizechart::config</resource>
             <resource>Magepow_Sizechart::config</resource>
             <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
             <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label><![CDATA[General]]></label>
                 <label><![CDATA[General]]></label>

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/footer.phtml

@@ -2,11 +2,6 @@
 $copyrightBlock = $block->getLayout()->createBlock('Magento\Theme\Block\Html\Footer');
 $copyrightBlock = $block->getLayout()->createBlock('Magento\Theme\Block\Html\Footer');
 ?>
 ?>
 <footer class="page-footer">
 <footer class="page-footer">
-    <div data-block-id="shopping_footer_why_choose_us">
-        <div class="choose-us">
-            <?= __("WHY CHOOSE US") ?>
-        </div>
-        <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('why_choose_us')->toHtml();?>
     <div class="footer-mini-copyright-content"><?= $block->escapeHtml($copyrightBlock->getCopyright()) ?></div>
     <div class="footer-mini-copyright-content"><?= $block->escapeHtml($copyrightBlock->getCopyright()) ?></div>
 </footer>
 </footer>
 <script>
 <script>

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

@@ -502,7 +502,7 @@ ul {
     position: fixed;
     position: fixed;
     font-size: larger;
     font-size: larger;
     bottom: 0;
     bottom: 0;
-    z-index: 6;
+    z-index: 1;
     width: 100%;
     width: 100%;
     margin: 0 auto;
     margin: 0 auto;
     left: 0;
     left: 0;