Merge remote-tracking branch 'origin/feature/svg_icon' into restore-old

falcon/_dev/css/theme/_index.scss

@@ -5,3 +5,4 @@
 @import "layout/index";
 @import "components/index";
 
+@import "custom/custom";

falcon/modules/is_favoriteproducts/views/templates/hook/button-product.tpl

@@ -18,7 +18,7 @@
             {/if}
         </div>
         <div class="favorite-btn__content favorite-btn__content--add">
-             {capture name="svg_output"}{svg_icon file='heart.svg'}{/capture}
+             {capture name="svg_output"}{svg_icon file='heart.svg' width="22"}{/capture}
             {if $smarty.capture.svg_output}
                 {$smarty.capture.svg_output nofilter}
             {else}

falcon/modules/is_favoriteproducts/views/templates/hook/button.tpl

@@ -17,7 +17,7 @@
         {/if}
     </div>
     <div class="favorite-btn__content favorite-btn__content--add">
-        {capture name="svg_output"}{svg_icon file='heart.svg'}{/capture}
+        {capture name="svg_output"}{svg_icon file='heart.svg' width="22"}{/capture}
         {if $smarty.capture.svg_output}
             {$smarty.capture.svg_output nofilter}
         {else}

falcon/modules/ps_contactinfo/ps_contactinfo.tpl

@@ -28,7 +28,13 @@
   <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
     <span class="h4 mb-0">{l s='Store information' d='Shop.Theme.Global'}</span>
     <a href="#footer_contact_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-      <i class="material-icons d-block"></i>
+        {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
+        {if $smarty.capture.svg_output}
+        <span style="margin-bottom: 3px;">
+            {$smarty.capture.svg_output nofilter}
+        {else}
+            <i class="material-icons d-block"></i>
+        {/if}
     </a>
   </div>
 

falcon/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl

@@ -28,7 +28,13 @@
   <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
     <span class="h4 mb-0">{l s='Your account' d='Shop.Theme.Customeraccount'}</span>
     <a href="#footer_account_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-      <i class="material-icons d-block"></i>
+        {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
+        {if $smarty.capture.svg_output}
+        <span style="margin-bottom: 3px;">
+            {$smarty.capture.svg_output nofilter}
+        {else}
+            <i class="material-icons d-block"></i>
+        {/if}
     </a>
   </div>
 

falcon/modules/ps_customersignin/ps_customersignin.tpl

@@ -34,7 +34,12 @@
     {/if}
   >
     <div class="header-top__icon-container">
-      <span class="header-top__icon material-icons">person</span>
+        {capture name="svg_output"}{svg_icon file='person.svg'}{/capture}
+        {if $smarty.capture.svg_output}
+            {$smarty.capture.svg_output nofilter}
+        {else}
+            <span class="header-top__icon material-icons">person</span>
+        {/if}
     </div>
   </a>
 </div>

falcon/modules/ps_linklist/views/templates/hook/linkblock-column.tpl

@@ -4,7 +4,13 @@
     <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
       <span class="h4 mb-0">{$linkBlock.title}</span>
       <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-        <i class="material-icons d-block"></i>
+        {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
+        {if $smarty.capture.svg_output}
+        <span style="margin-bottom: 3px;">
+            {$smarty.capture.svg_output nofilter}
+        {else}
+            <i class="material-icons d-block"></i>
+        {/if}
       </a>
     </div>
     <div id="footer_sub_menu_{$_expand_id}" class="collapse d-md-block">

falcon/modules/ps_linklist/views/templates/hook/linkblock.tpl

@@ -29,7 +29,13 @@
       <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
         <span class="h4 mb-0">{$linkBlock.title}</span>
         <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-          <i class="material-icons d-block"></i>
+            {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
+            {if $smarty.capture.svg_output}
+            <span style="margin-bottom: 3px;">
+                {$smarty.capture.svg_output nofilter}
+            {else}
+                <i class="material-icons d-block"></i>
+            {/if}
         </a>
       </div>
       <div id="footer_sub_menu_{$_expand_id}" class="collapse d-md-block">

falcon/modules/ps_mainmenu/ps_mainmenu.tpl

@@ -21,9 +21,14 @@
             >
               <span class="align-self-center">{$node.label}</span>
               {if $node.children|count}
+                {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
+                {if $smarty.capture.svg_output}
                 <span class="d-none d-md-block pl-1" style="margin-bottom: 3px;">
-                    {svg_icon file='chevron_down.svg' }  
+                    {$smarty.capture.svg_output nofilter}
                 </span>
+                {else}
+                    <i class="material-icons d-block"></i>
+                {/if}
               {/if}
             </a>
             {if $node.children|count}