Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New orange logo #1392

Merged
merged 4 commits into from
Mar 26, 2018
Merged

New orange logo #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99d4fe0
New orange logo
tvdeyen Mar 14, 2018
baa433d
Allow to pass an inline_image as navigation image
tvdeyen Mar 26, 2018
e7fe797
Use current color for SVG icon
tvdeyen Mar 26, 2018
8988878
Replace the old favicon
tvdeyen Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified app/assets/images/alchemy/alchemy-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 1 addition & 70 deletions app/assets/images/alchemy/alchemy-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/alchemy/favicon.ico
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion app/assets/images/alchemy/icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions app/assets/stylesheets/alchemy/navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
border-style: none;
height: 24px;
vertical-align: -0.6em;
transition: filter $transition-duration $transition-easing;
}

.icon {
Expand Down Expand Up @@ -115,10 +114,6 @@
text-decoration: none;
text-shadow: none;
}

img {
filter: invert(80%);
}
}

a {
Expand Down
4 changes: 4 additions & 0 deletions app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Expand Down
2 changes: 1 addition & 1 deletion config/alchemy/modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down