From 14dfc4c1cd3aa152e79d430c8cad8460c111fa5f Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Sun, 1 Apr 2018 18:01:26 -0400 Subject: Reverted back to regular logo and server name. --- app/assets/images/logo.png | Bin 3764 -> 14280 bytes app/assets/images/real_logo.png | Bin 54121 -> 0 bytes app/views/layouts/application.html.erb | 4 ++-- app/views/statics/home.html.erb | 8 ++++---- app/views/statics/online.html.erb | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 app/assets/images/real_logo.png diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png index 643c0e3..6e4f8af 100644 Binary files a/app/assets/images/logo.png and b/app/assets/images/logo.png differ diff --git a/app/assets/images/real_logo.png b/app/assets/images/real_logo.png deleted file mode 100644 index 087888f..0000000 Binary files a/app/assets/images/real_logo.png and /dev/null differ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5c7c90f..e85d417 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,9 +1,9 @@ - <%= yield(:site_title).present? ? "#{yield(:site_title)} – " : "" %>Synergy + <%= yield(:site_title).present? ? "#{yield(:site_title)} – " : "" %>Redstoner - + <%= stylesheet_link_tag "application", :media => "all" %> <% if current_user.try(:dark) == true %> <%= stylesheet_link_tag "dark", :media => "all" %> diff --git a/app/views/statics/home.html.erb b/app/views/statics/home.html.erb index 9a54366..a5f3242 100644 --- a/app/views/statics/home.html.erb +++ b/app/views/statics/home.html.erb @@ -3,12 +3,12 @@

Community. Circuitry. Creativity.

-
Join us: synergy.redstoner.com
+
Join us: redstoner.com
-<%= image_tag "real_logo.png" %> +<%= image_tag "logo.svg" %>

- Synergy is an amazing minecraft server + Redstoner is an amazing minecraft server for all redstoners of any (or no) skill level, beginner to advanced, from combo locks to doors to CPUs! @@ -30,4 +30,4 @@ for those who just want to mine some ore and we have a freebuild world for large projects.

-

Join us now!

+

Join us now!

\ No newline at end of file diff --git a/app/views/statics/online.html.erb b/app/views/statics/online.html.erb index abfbf18..8bacf6f 100644 --- a/app/views/statics/online.html.erb +++ b/app/views/statics/online.html.erb @@ -1,5 +1,5 @@ <% title "Who's Playing?" %> -

These players are currently playing on Synergy (<%= @count %>):

+

These players are currently playing on Redstoner (<%= @count %>):

<% @players.each do |u| %>
-- cgit v1.2.3