diff options
author | jomo <github@jomo.tv> | 2015-03-23 22:31:22 +0100 |
---|---|---|
committer | jomo <github@jomo.tv> | 2015-03-23 22:31:22 +0100 |
commit | d4a7d96d4ad157ee6b9e85a77fbfbec2300dbc6b (patch) | |
tree | 5b5ce73cade5ab3f4c9e4324c71288f10f63beeb | |
parent | e1ffb534dbe2162a0621eb401218a1c548317364 (diff) |
new footer with links
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | app/assets/images/github.png | bin | 0 -> 631 bytes | |||
-rw-r--r-- | app/assets/images/twitter.png | bin | 0 -> 334 bytes | |||
-rw-r--r-- | app/assets/stylesheets/style.css.scss | 13 | ||||
-rw-r--r-- | app/views/layouts/_footer.html.erb | 13 |
5 files changed, 24 insertions, 5 deletions
@@ -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 Binary files differnew file mode 100644 index 0000000..186e576 --- /dev/null +++ b/app/assets/images/github.png diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png Binary files differnew file mode 100644 index 0000000..b9bb3f0 --- /dev/null +++ b/app/assets/images/twitter.png 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 |