diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store index 77cd8866..9b9b1f14 100644 Binary files a/app/assets/images/.DS_Store and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/textures/theme1.jpg b/app/assets/images/textures/theme1.jpg new file mode 100644 index 00000000..a0061393 Binary files /dev/null and b/app/assets/images/textures/theme1.jpg differ diff --git a/app/assets/images/theme1/banner-tall.png b/app/assets/images/theme1/banner-tall.png new file mode 100644 index 00000000..a2f5c775 Binary files /dev/null and b/app/assets/images/theme1/banner-tall.png differ diff --git a/app/assets/stylesheets/_constants.css.sass b/app/assets/stylesheets/_constants.css.sass index 919522a7..4f3aade9 100644 --- a/app/assets/stylesheets/_constants.css.sass +++ b/app/assets/stylesheets/_constants.css.sass @@ -1,4 +1,6 @@ -$qbrown: #634227 +//$qbrown: #634227 +$qbrown: #853d15 $qbrown-active: lighten($qbrown, 20%) -$wood: image-url('textures/wood001-vertical.jpg') +//$wood: image-url('textures/wood001-vertical.jpg') +$wood: image-url('textures/theme1.jpg') $background-brown: #57351f diff --git a/app/assets/stylesheets/theme1/theme1.css.sass b/app/assets/stylesheets/theme1/theme1.css.sass index cf043f83..c4bfa3a2 100644 --- a/app/assets/stylesheets/theme1/theme1.css.sass +++ b/app/assets/stylesheets/theme1/theme1.css.sass @@ -54,13 +54,13 @@ body background-image: image-url('theme1/light-3.jpg') .container width: 960px - padding-top: 60px + padding-top: 40px position: relative z-index: 4 margin: 0 auto #header margin-bottom: 20px - height: 74px + height: 14px #logo a margin: 20px @@ -89,6 +89,7 @@ body clear: both overflow: hidden z-index: 100 + position: relative width: 900px height: 48px padding: 11px 25px 24px 25px @@ -154,7 +155,7 @@ body margin-left: 61px width: 840px height: 260px - background-image: image-url('theme1/banner-tall.jpg') + background-image: image-url('theme1/banner-tall.png') #main-wrap font-size: 14px font-family: Georgia, serif diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 00d2a1b7..6eba4bab 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -4,6 +4,7 @@ class DashboardController < ApplicationController def demo_both + render layout: 'twitter-bootstrap' end # Testing action