Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

postgres

  • Loading branch information...
commit 11d73e2d5a8e01a4505604cc8e49b0cf2168a8aa 1 parent f2c9ed6
andy authored
View
2  Gemfile
@@ -5,7 +5,7 @@ gem 'rails', '3.2.6'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'sqlite3'
+gem 'pg'
gem "therubyracer"
gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
View
4 Gemfile.lock
@@ -60,6 +60,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.7)
+ pg (0.14.1)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -95,7 +96,6 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thor (0.16.0)
@@ -119,9 +119,9 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
jquery-rails
less-rails
+ pg
rails (= 3.2.6)
sass-rails (~> 3.2.3)
- sqlite3
therubyracer
twitter-bootstrap-rails
uglifier (>= 1.0.3)
View
34 app/assets/stylesheets/welcome.css.scss
@@ -1,23 +1,19 @@
-// Place all the styles related to the welcome controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
-
-
html {
-min-height: 100%;
-background: rgb(124,214,197); /* Old browsers */
-background: -moz-linear-gradient(top, rgba(124,214,197,1) 0%, rgba(203,216,214,1) 100%); /* FF3.6+ */
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(124,214,197,1)), color-stop(100%,rgba(203,216,214,1))); /* Chrome,Safari4+ */
-background: -webkit-linear-gradient(top, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* Chrome10+,Safari5.1+ */
-background: -o-linear-gradient(top, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* Opera 11.10+ */
-background: -ms-linear-gradient(top, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* IE10+ */
-background: linear-gradient(to bottom, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* W3C */
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7cd6c5', endColorstr='#cbd8d6',GradientType=0 ); /* IE6-9 */}
-
-#whale-container { display: block; float: left; margin: 15% 0 0 6%; }
-#song-container { display: block; float: left; margin: 15% 0 50px 12px;}
-
-#whale-img { max-width: 450px; width: 100%;}
+ min-height: 100%;
+ background: rgb(124,214,197); /* Old browsers */
+ background: -moz-linear-gradient(top, rgba(124,214,197,1) 0%, rgba(203,216,214,1) 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(124,214,197,1)), color-stop(100%,rgba(203,216,214,1))); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* IE10+ */
+ background: linear-gradient(to bottom, rgba(124,214,197,1) 0%,rgba(203,216,214,1) 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7cd6c5', endColorstr='#cbd8d6',GradientType=0 ); /* IE6-9 */
+}
+
+#whale-container { display: block; float: left; width: 50%; height: 100%; margin: 6% 0 0 6%; }
+#song-container { display: block; float: left; width: 40%; height: 100%; margin: 14% 0 0px 0px;}
+
+#whale-img { width: 100%;}
#album { max-height: 120px; margin: 20px 0 20px 25px; display: block;}
View
7 app/views/welcome/index.html.erb
@@ -1,9 +1,9 @@
<div id="container row-fluid show-grid">
- <div id="whale-container" class="span5">
+ <div id="whale-container" >
<%= image_tag "whale.png", :id => "whale-img" %>
</div>
- <div id="song-container" class="span7">
+ <div id="song-container" >
<%= image_tag "album.png", :id => "album" %>
<ul id="songs">
@@ -56,9 +56,6 @@
</li>
</ul>
</div>
-<!-- <div id="footer">
- <%#= image_tag "credits.png", :id =>"credits" %>
- </div> -->
</div>
<audio id="player" class="mp3player" width="300" height="32" src="" controls="controls" data-current="" autobuffer=""></audio>
View
27 config/database.yml
@@ -3,23 +3,14 @@
#
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
-development:
- adapter: sqlite3
- database: db/development.sqlite3
- pool: 5
- timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- adapter: sqlite3
- database: db/test.sqlite3
- pool: 5
- timeout: 5000
-
production:
- adapter: sqlite3
- database: db/production.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: production
pool: 5
- timeout: 5000
+
+development:
+ adapter: postgresql
+ encoding: unicode
+ database: development
+ pool: 5

0 comments on commit 11d73e2

Please sign in to comment.
Something went wrong with that request. Please try again.