diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
| commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
| tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b /app | |
| parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
| parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) | |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/main/homepage.js.coffee (renamed from app/assets/javascripts/static/homepage.js.coffee) | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/static.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/main.css.scss | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/static.css.scss | 14 | ||||
| -rw-r--r-- | app/controllers/main_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/static_controller.rb | 4 | ||||
| -rw-r--r-- | app/helpers/static_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/main/homepage.html.erb (renamed from app/views/static/homepage.html.erb) | 0 |
8 files changed, 13 insertions, 23 deletions
diff --git a/app/assets/javascripts/static/homepage.js.coffee b/app/assets/javascripts/main/homepage.js.coffee index e69de29..e69de29 100644 --- a/app/assets/javascripts/static/homepage.js.coffee +++ b/app/assets/javascripts/main/homepage.js.coffee diff --git a/app/assets/javascripts/static.js.coffee b/app/assets/javascripts/static.js.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/static.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss index a0d94c1..3859f53 100644 --- a/app/assets/stylesheets/main.css.scss +++ b/app/assets/stylesheets/main.css.scss @@ -1,3 +1,14 @@ // Place all the styles related to the main controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.jumbotron { + background-color: #FFF; + box-shadow: 1px 1px 20px black; + width: 93%; + + p { + line-height: 1.5em; + } + +} diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss deleted file mode 100644 index 6732370..0000000 --- a/app/assets/stylesheets/static.css.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Place all the styles related to the static controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -.jumbotron { - background-color: #FFF; - box-shadow: 1px 1px 20px black; - width: 93%; - - p { - line-height: 1.5em; - } - -} diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 6519d7b..0ba4d94 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -1,2 +1,4 @@ class MainController < ApplicationController + def homepage + end end diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb deleted file mode 100644 index 6fc9490..0000000 --- a/app/controllers/static_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -class StaticController < ApplicationController - def homepage - end -end diff --git a/app/helpers/static_helper.rb b/app/helpers/static_helper.rb deleted file mode 100644 index 8cfc9af..0000000 --- a/app/helpers/static_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module StaticHelper -end diff --git a/app/views/static/homepage.html.erb b/app/views/main/homepage.html.erb index 3ca8176..3ca8176 100644 --- a/app/views/static/homepage.html.erb +++ b/app/views/main/homepage.html.erb |