diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss index 98f87c8..e6bf21f 100644 --- a/app/assets/stylesheets/style.css.scss +++ b/app/assets/stylesheets/style.css.scss @@ -177,6 +177,11 @@ a { p { font-size: 16px; + + span { + // used to control eventual line breaks a bit + display: inline-block; + } } img { diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb index 8afed77..f211319 100644 --- a/app/controllers/statics_controller.rb +++ b/app/controllers/statics_controller.rb @@ -1,6 +1,6 @@ class StaticsController < ApplicationController - def index + def home end def donate diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 5e64030..8654399 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -3,7 +3,7 @@ <%= link_to "", root_path, id: "logo" %>
+ Redstoner is an amazing server + for all redstoners of any (or no) skill level, + beginner to advanced, + from combo locks to doors to CPUs! +
++ We have a friendly community + and experienced staff + who are all kind and welcoming. +
++ A proof for our great community is the ton of + welcome messages you get on your first join, + from normal members and staff alike. +
++ The Creative plot world is full of amazing plots, + where you can build on your own or with friends! + There's also a Survival world + 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 diff --git a/app/views/statics/index.html.erb b/app/views/statics/index.html.erb deleted file mode 100644 index b875fde..0000000 --- a/app/views/statics/index.html.erb +++ /dev/null @@ -1,24 +0,0 @@ -<% title "Home" %> -<% content_for :main_class, "front-page" %> - -
- Redstoner is an amazing server for all redstoners of any (or no) skill level, beginner to advanced,
- from combo locks to doors to CPUs!
-
- We have a friendly community and an experienced staff who are all kind and welcoming. -
-- A proof for our great community is the ton of welcome messages you get on your first join, from normal members and staff alike. -
-
- The dedicated plot world is full of amazing plots, where you can build on your own or with your friends and
- there is also a survival world for those who just want to mine some ore, and a free build world for large projects
-
Join us now!
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 58e7285..b02bde6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,10 +4,11 @@ Redstoner::Application.routes.draw do resources :comments end - resources :statics, only: [:index, :donate], path: '/' do + resources :statics, only: [:home, :donate], path: '/' do collection do get 'donate' - get 'index' + get 'home' + get 'index', to: redirect('/home') end end @@ -50,5 +51,5 @@ Redstoner::Application.routes.draw do # post 'paypal' => 'paypal#create' - root to: 'statics#index' + root to: 'statics#home' end \ No newline at end of file