summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorLogan Fick <logaldeveloper@protonmail.com>2018-03-31 19:54:48 -0400
committerLogan Fick <logaldeveloper@protonmail.com>2018-03-31 19:54:48 -0400
commit5b97df57c88465cf051f89664af2209a80efa543 (patch)
tree46e8062d9ab22b0af47aa6d23efc0676c31719bd /app
parentd7ad2b04a58886df6832309fcbd5ba031896ba30 (diff)
Fixed use of incorrect logo and server name.
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/logo.pngbin14280 -> 4898 bytes
-rw-r--r--app/assets/images/real_logo.pngbin0 -> 54121 bytes
-rw-r--r--app/views/layouts/application.html.erb4
-rw-r--r--app/views/statics/home.html.erb8
-rw-r--r--app/views/statics/online.html.erb2
5 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
index 6e4f8af..6c59bb2 100644
--- a/app/assets/images/logo.png
+++ b/app/assets/images/logo.png
Binary files differ
diff --git a/app/assets/images/real_logo.png b/app/assets/images/real_logo.png
new file mode 100644
index 0000000..087888f
--- /dev/null
+++ b/app/assets/images/real_logo.png
Binary files 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 @@
<!DOCTYPE html>
<html>
<head>
- <title><%= yield(:site_title).present? ? "#{yield(:site_title)} – " : "" %>Redstoner</title>
+ <title><%= yield(:site_title).present? ? "#{yield(:site_title)} – " : "" %>Synergy</title>
<meta name="viewport" content="initial-scale=1,maximum-scale=1">
- <meta name="description" content="Redstoner is a creative minecraft server made for redstoners">
+ <meta name="description" content="Synergy is a creative minecraft server made for redstoners">
<%= 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 @@
<h1>Community. Circuitry. Creativity.</h1>
-<div id="join-now">Join us: redstoner.com</div>
+<div id="join-now">Join us: synergy.redstoner.com</div>
-<%= image_tag "logo.svg" %>
+<%= image_tag "logo.png" %>
<p>
- <span>Redstoner is an amazing minecraft server</span>
+ <span>Synergy is an amazing minecraft server</span>
<span>for all redstoners of any (or no) skill level,</span>
<span>beginner to advanced,</span>
<span>from combo locks to doors to CPUs!</span>
@@ -30,4 +30,4 @@
<span>for those who just want to mine some ore</span>
<span>and we have a freebuild world for large projects.</span>
</p>
-<p>Join us now!</p> \ No newline at end of file
+<p>Join us now!</p>
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?" %>
-<h1>These players are currently playing on Redstoner (<%= @count %>):</h1>
+<h1>These players are currently playing on Synergy (<%= @count %>):</h1>
<div id="userlist">
<% @players.each do |u| %>
<div class="list-user">