From bc65256776f249e4f90052727307278a5f2caa4e Mon Sep 17 00:00:00 2001 From: Dan Elbert Date: Wed, 20 Jan 2016 12:53:51 -0600 Subject: [PATCH] Theme switching --- app/assets/stylesheets/application.scss | 9 +++++---- app/views/layouts/application.html.erb | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 40b39ec..775c97e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,9 +16,9 @@ */ @import "bootstrap-sprockets"; -@import "journal/_variables"; +@import "readable/_variables"; @import "bootstrap"; -@import "journal/_bootswatch"; +@import "readable/_bootswatch"; @import "typeahead-bootstrap"; @import "recipes"; @@ -32,7 +32,7 @@ html { body { /* Margin bottom by footer height */ margin-bottom: $footer_height; - background: image_url("old_mathematics.png"); + background: image_url("grey_wash_wall.png"); } #main_container { @@ -45,5 +45,6 @@ body { bottom: 0; width: 100%; height: $footer_height; - background-color: #f5f5f5; + background-color: $gray-lighter; + border-top: solid 1px $gray-light; } \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bfdd3be..f2bacc8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -51,8 +51,12 @@