diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png index 6e4f8af..6c59bb2 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 new file mode 100644 index 0000000..087888f Binary files /dev/null and b/app/assets/images/real_logo.png differ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e85d417..5c7c90f 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)} – " : "" %>Redstoner + <%= yield(:site_title).present? ? "#{yield(:site_title)} – " : "" %>Synergy - + <%= 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 a5f3242..f09d690 100644 --- a/app/views/statics/home.html.erb +++ b/app/views/statics/home.html.erb @@ -3,12 +3,12 @@

Community. Circuitry. Creativity.

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

- Redstoner is an amazing minecraft server + Synergy 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!

\ No newline at end of file +

Join us now!

diff --git a/app/views/statics/online.html.erb b/app/views/statics/online.html.erb index 8bacf6f..abfbf18 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 Redstoner (<%= @count %>):

+

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

<% @players.each do |u| %>