fix: prevent icon_font and fontawesome mix

D-Sketon · Dec 1, 2024 · 0d71651 · 0d71651
1 parent c5149b3
commit 0d71651
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
@@ -10,7 +10,7 @@
     <% } else { %>
       <% for (let item of theme.menu) { %>
         <span class="main-nav-link-wrap">
-          <div class="main-nav-icon icon <%= item.icon === 'e62b' || item.icon === 'f6ad' || !item.icon ? 'rotate' : '' %>">
+          <div class="main-nav-icon icon <%= (item.icon === 'e62b' && theme.icon_font) || (item.icon === 'f6ad' && !theme.icon_font) || !item.icon ? 'rotate' : '' %>">
             <%- item.icon ? `&#x${item.icon};` : (theme.icon_font ? '&#xe62b;' : '&#xf6ad;') %>
           </div>
           <a class="main-nav-link" href="<%- url_for(item.url) %>"><%= __(item.name) %></a>

diff --git a/layout/_partial/sidebar/common-sidebar.ejs b/layout/_partial/sidebar/common-sidebar.ejs
@@ -37,7 +37,7 @@
     <% for (let item of theme.menu) { %>
       <div class="sidebar-menu-link-wrap">
         <a class="sidebar-menu-link-dummy" href="<%- url_for(item.url) %>" aria-label="<%= __(item.name) %>"></a>
-        <div class="sidebar-menu-icon icon <%= item.icon === 'e62b' || item.icon === 'f6ad' || !item.icon ? 'rotate' : '' %>">
+        <div class="sidebar-menu-icon icon <%= (item.icon === 'e62b' && theme.icon_font) || (item.icon === 'f6ad' && !theme.icon_font) || !item.icon ? 'rotate' : '' %>">
           <%- item.icon ? `&#x${item.icon};` : (theme.icon_font ? '&#xe62b;' : '&#xf6ad;') %>
         </div>
         <div class="sidebar-menu-link"><%= __(item.name) %></div>