From d4a7d96d4ad157ee6b9e85a77fbfbec2300dbc6b Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Mon, 23 Mar 2015 22:31:22 +0100
Subject: [PATCH] new footer with links

---
 .gitignore                            |   3 +--
 app/assets/images/github.png          | Bin 0 -> 631 bytes
 app/assets/images/twitter.png         | Bin 0 -> 334 bytes
 app/assets/stylesheets/style.css.scss |  13 +++++++++++--
 app/views/layouts/_footer.html.erb    |  13 ++++++++++++-
 5 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/images/github.png
 create mode 100644 app/assets/images/twitter.png

diff --git a/.gitignore b/.gitignore
index cbc254b..5393863 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,4 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
-*.sublime-workspace
-*.sublime-project
+*.sublime-*
diff --git a/app/assets/images/github.png b/app/assets/images/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..186e576a7590c1b2ed0c3a488b8da7541616190f
GIT binary patch
literal 631
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*Tg=CK)Uj~LMH3o);76yi2
z3=9knFBlj~4Hy_+B``2p&0t^<FPO6{(1wA5;d6jbh%3kd0RbT)Az@)*5g{Q41_lv9
zK@eL|P*_lqkB<*z8!xYjkdTP5FarYv3kwS`FRu_-B?B1n@$vEV^NR=ziwFzz^YaS`
z2!PlkA`lW}pfCss2nYxZ3yTR0Gcqy?^79Mw@CfqqihyK5x)>N37#SIvn3&kv*_oJ_
z1O){}L_`ExS$TPR`N8IcoFptPC@9F!&kr#Z<RpkKV23d<FbIR)EG#SxbrRSk;-aFW
zA|m{}{7g(t0s;d6|Nr-wHDAQQz~EgH<QL3fH~r=(=0(Sr95idZbK`r7xy1|~E=CiF
zdp{NBe?0v5f$5{a&#gIsep_2TpJnj#?Kg+lx-)fR4l4D(lM~?mx_;W9w~`XAWk-bs
zH)gV)5M~E?Bgxy{CE#(M&mIN_hV`B<jv*44ZTmvS4mk+0NH?)^vXqyXm$$pUtCu!w
z39#RMH-Fnb2Byi8n<7*;b6SN-*WXxkKj*pp?rRnr*0Fj0?jL`pSTRifqAb9|r1-;A
z)JfpqNdZAA7s+mESEZ90BFjFgyRv4cZE`#JY(|^Qv))AxVu4jtv_oyLze-^~o4)$*
zs}&C0m(RV%&L-1$OjzNMSmmnRQ=5M}^*rs0d0lUQ`>veD1oy*rR`Ct5->%zh|0r2z
UQt8J%VxWliboFyt=akR{03djy$N&HU

literal 0
HcmV?d00001

diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9bb3f01c4f9ee5515f57ba26dc0a740d5f65902
GIT binary patch
literal 334
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*Tg=CK)Uj~LMH3o);76yi2
z3=9knFBlj~4Hy_+B``2p&0t^<FPO6{(1wA5AuYfs#P!|xUv>L$_^&*pKkG2Vlrs#|
zE-*|y>9F9a{G@&M+a4!uIM1-;F~gd73=8k`uX({R=Y~M{uKYbW9oAf9Sow-!<`w=8
z?+o^Qth@YW-kmS{JKhEy{VdS2jiGZd!~EOvr@z!){WkCZkN^Mw2Nlhq$-uzCSQ6wH
z%;50sMjD8d<n8XFcqE5cjDdk6*3-o?MB;LCf&!z#Aqk&^Ni$og_ReKK^Caal)1*5#
zHa2@|1XOMQFvT?4C@?(a{`i68bGHJgLB}VDMu`vy88s!w&F(^>i~=4DKkQtRn$lQf
msbYTW^l9x0kJL>V7}5h+_V(Ead}m-_VDNPHb6Mw<&;$VS0f4Un

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss
index 8e8131e..a0bac27 100644
--- a/app/assets/stylesheets/style.css.scss
+++ b/app/assets/stylesheets/style.css.scss
@@ -936,9 +936,18 @@ img {
 
   .note {
     color: #888;
-    font-size: 12px;
-    font-style: italic;
     margin-top: 5em;
+
+    a {
+      color: inherit;
+      &:hover {
+        color: #555;
+      }
+    }
+
+    * {
+      vertical-align: middle;
+    }
   }
 }
 
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 673defe..be7ea64 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -7,6 +7,17 @@
     <% end %>
   </div>
   <div class="note">
-    Website made by <a href="/users/2">jomo</a> with design by <a href="/users/12">ColoArtz</a>. | <a href="/dmca" target="_blank"><small>DMCA</small></a>
+    <%= link_to "DMCA", dmca_path %> |
+    <%= link_to "https://github.com/RedstonerServer", title: "Redstoner on GitHub" do %>
+      GitHub <%=image_tag("github.png") %>
+    <% end %>
+    <%= link_to "https://twitter.com/RedstonerServer", title: "Redstoner on Twitter" do %>
+      Twitter <%= image_tag("twitter.png") %>
+    <% end %>
+    <% if current_user %>
+      <%= link_to "http://slack-redstoner-public.herokuapp.com/?" + {mail: current_user.try(:email)}.to_param do %>
+        Join us on <img src="http://slack-redstoner-public.herokuapp.com/badge.svg" alt="Slack">
+      <% end %>
+    <% end %>
   </div>
 </div>
\ No newline at end of file