Merge pull request #1392 from tvdeyen/new-logo

New orange logo
AlchemyCMS · Mar 26, 2018 · 5e1d3ff · 5e1d3ff
2 parents 79a58e6 + 8988878
commit 5e1d3ff
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 77 deletions.
diff --git a/app/assets/images/alchemy/alchemy-logo.png b/app/assets/images/alchemy/alchemy-logo.png
diff --git a/app/assets/images/alchemy/alchemy-logo.svg b/app/assets/images/alchemy/alchemy-logo.svg
diff --git a/app/assets/images/alchemy/favicon.ico b/app/assets/images/alchemy/favicon.ico
diff --git a/app/assets/images/alchemy/icon.svg b/app/assets/images/alchemy/icon.svg
diff --git a/app/assets/stylesheets/alchemy/navigation.scss b/app/assets/stylesheets/alchemy/navigation.scss
@@ -70,7 +70,6 @@
     border-style: none;
     height: 24px;
     vertical-align: -0.6em;
-    transition: filter $transition-duration $transition-easing;
   }
 
   .icon {
@@ -115,10 +114,6 @@
       text-decoration: none;
       text-shadow: none;
     }
-
-    img {
-      filter: invert(80%);
-    }
   }
 
   a {

diff --git a/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb b/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
@@ -3,6 +3,10 @@
     <%= link_to url_for_module(alchemy_module) do %>
       <% if navigation["image"] %>
         <%= image_tag(navigation["image"]) %>
+      <% elsif navigation["inline_image"] %>
+        <span class="icon fa-fw">
+          <%== navigation["inline_image"] %>
+        </span>
       <% elsif navigation["icon"] %>
         <i class="module icon fas fa-<%= navigation["icon"] %> fa-lg fa-fw"></i>
       <% else %>

diff --git a/config/alchemy/modules.yml b/config/alchemy/modules.yml
@@ -7,7 +7,7 @@
     name: 'modules.dashboard'
     controller: 'alchemy/admin/dashboard'
     action: index
-    image: 'alchemy/icon.svg'
+    inline_image: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -6 32 32" class="svg-inline--fa fa-lg fa-fw"><path fill="currentColor" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/></svg>'
 
 - name: pages
   engine_name: alchemy