diff --git a/app/assets/images/app-icon-2.png b/app/assets/images/app-icon-2.png index 010d0156..0d8e6b72 100644 Binary files a/app/assets/images/app-icon-2.png and b/app/assets/images/app-icon-2.png differ diff --git a/app/assets/images/app-icon.png b/app/assets/images/app-icon.png index 893e9f1b..6acd7e4a 100644 Binary files a/app/assets/images/app-icon.png and b/app/assets/images/app-icon.png differ diff --git a/app/assets/images/infinitacle-reverse.svg b/app/assets/images/infinitacle-reverse.svg new file mode 100755 index 00000000..bbadb813 --- /dev/null +++ b/app/assets/images/infinitacle-reverse.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/infinitacle-round.svg b/app/assets/images/infinitacle-round.svg new file mode 100644 index 00000000..32368333 --- /dev/null +++ b/app/assets/images/infinitacle-round.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/infinitacle.svg b/app/assets/images/infinitacle.svg new file mode 100755 index 00000000..4aaef41c --- /dev/null +++ b/app/assets/images/infinitacle.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/octobox-reverse.svg b/app/assets/images/octobox-reverse.svg deleted file mode 100644 index 669203a2..00000000 --- a/app/assets/images/octobox-reverse.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/assets/images/octobox.svg b/app/assets/images/octobox.svg deleted file mode 100644 index 3ce04e90..00000000 --- a/app/assets/images/octobox.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5411ff58..fb9835d5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -25,15 +25,15 @@ module ApplicationHelper end def octobox_icon(height=16) - " - - ".html_safe + image_tag('infinitacle.svg', alt: "Octobox", height: height) end def octobox_reverse_icon(height=16) - " - - ".html_safe + image_tag('infinitacle-reverse.svg', alt: "Octobox", height: height) + end + + def octobox_round(height=80) + image_tag('infinitacle-round.svg', alt: "Logo", height: height) end def menu_separator(custom_class=nil) diff --git a/app/views/layouts/_favicons.html.erb b/app/views/layouts/_favicons.html.erb index 7722245c..01b85970 100644 --- a/app/views/layouts/_favicons.html.erb +++ b/app/views/layouts/_favicons.html.erb @@ -12,7 +12,7 @@ -" color="black"> +" color="black"> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index d2235564..ca492c25 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -3,6 +3,9 @@ © 2018 Andrew Nesbitt, <%= link_to 'et al', "#{Octobox.config.source_repo}/graphs/contributors", target: '_blank', rel: "noopener" %> — + Logo by + <%= link_to 'Raeha Keller', "https://www.etsy.com/uk/people/PrincessRaeha", target: '_blank', rel: "noopener" %> + — <%= link_to 'Source', Octobox.config.source_repo, target: '_blank', rel: "noopener" %> available under <%= link_to 'AGPL 3.0', "#{Octobox.config.source_repo}/blob/master/LICENSE.txt", target: '_blank', rel: "noopener" %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 12177d13..ec3c8f12 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,6 +1,6 @@