Switch from center to left alignment for now (less complex), other ch…

…anges
evanrmurphy · Nov 14, 2010 · ba4a308 · ba4a308
1 parent 5fe2129
commit ba4a308
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 20 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'haml'
 gem 'compass', '>= 0.10.6'
 gem 'gravatar_image_tag'
-gem 'will_paginate'
+gem 'will_paginate', '3.0.pre2'
 
 # Use unicorn as the web server
 # gem 'unicorn'
@@ -29,6 +29,7 @@ gem 'will_paginate'
 group :development do
   gem 'rspec-rails'
   gem 'annotate-models'
+  gem 'faker'
 end
 
 # Specifying version 0.7.1 of webrat resolves

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -41,6 +41,7 @@ GEM
     factory_girl_rails (1.0)
       factory_girl (~> 1.3)
       rails (>= 3.0.0.beta4)
+    faker (0.3.1)
     gravatar_image_tag (0.1.0)
     haml (3.0.23)
     i18n (0.4.2)
@@ -90,7 +91,7 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (2.3.15)
+    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
@@ -99,11 +100,12 @@ DEPENDENCIES
   annotate-models
   compass (>= 0.10.6)
   factory_girl_rails
+  faker
   gravatar_image_tag
   haml
   rails (= 3.0.1)
   rspec
   rspec-rails
   sqlite3-ruby
   webrat (= 0.7.1)
-  will_paginate
+  will_paginate (= 3.0.pre2)
diff --git a/app/stylesheets/application.scss b/app/stylesheets/application.scss
@@ -2,17 +2,18 @@
 
 #logo {
   font-family: 'Reenie Beanie', arial, cursive;
-  font-size: 128px;
+  font-size: 72px;
   #define { }
   #ly { color:green; }
 }
 
 #try-link {
   font-family: verdana;
-  font-size: 24px;
+  font-size: 16px;
 }
 
-h1 { font-size:32px; }
+h1 { font-size:24px; }
+strong { font-weight:bold; }
 
 .center {
   margin: 0px auto 0px auto;

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -10,7 +10,6 @@
     = javascript_include_tag :defaults
     = csrf_meta_tag
   %body
-    .center
-      #logo <span id="define">Define</span><span id="ly">ly!</span>
-      = yield
-      = debug(params) if Rails.env.development?
+    #logo <span id="define">Define</span><span id="ly">ly!</span>
+    = yield
+    = debug(params) if Rails.env.development?
diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml
@@ -1,4 +1,3 @@
 = stylesheet_link_tag 'screen.css', :media => 'screen, projection'
 
-.center
-  = link_to 'Try it now!', 'entries/new', :id => 'try-link'
+= link_to 'Sign up now!', signup_path, :id => 'try-link'
diff --git a/lib/tasks/sample_data.rake b/lib/tasks/sample_data.rake
@@ -0,0 +1,23 @@
+require 'faker'
+
+namespace :db do
+  desc "Fill database with sample data"
+  task :populate => :environment do
+    Rake::Task['db:reset'].invoke
+    User.create!(:name => "Example User",
+                 :email => "user@example.com")
+    99.times do |n|
+      name  = Faker::Name.name
+      email = "user-#{n+1}@example.com"
+      User.create!(:name => name,
+                   :email => email)
+    end
+
+    User.all(:limit => 6).each do |user|
+      50.times do
+        user.entries.create!(:word => Faker::Lorem.words(1),
+                             :definition => Faker::Lorem.sentence(5))
+      end
+    end
+  end
+end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -128,7 +128,7 @@ a.negative:active, button.negative:active {
 /* line 3, ../../app/stylesheets/application.scss */
 #logo {
   font-family: 'Reenie Beanie', arial, cursive;
-  font-size: 128px;
+  font-size: 72px;
 }
 /* line 7, ../../app/stylesheets/application.scss */
 #logo #ly {
@@ -138,15 +138,20 @@ a.negative:active, button.negative:active {
 /* line 10, ../../app/stylesheets/application.scss */
 #try-link {
   font-family: verdana;
-  font-size: 24px;
+  font-size: 16px;
 }
 
 /* line 15, ../../app/stylesheets/application.scss */
 h1 {
-  font-size: 32px;
+  font-size: 24px;
+}
+
+/* line 16, ../../app/stylesheets/application.scss */
+strong {
+  font-weight: bold;
 }
 
-/* line 17, ../../app/stylesheets/application.scss */
+/* line 18, ../../app/stylesheets/application.scss */
 .center {
   margin: 0px auto 0px auto;
   text-align: center;

diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css
@@ -192,7 +192,7 @@ a.negative:active, button.negative:active {
 /* line 3, ../../app/stylesheets/application.scss */
 #logo {
   font-family: 'Reenie Beanie', arial, cursive;
-  font-size: 128px;
+  font-size: 72px;
 }
 /* line 7, ../../app/stylesheets/application.scss */
 #logo #ly {
@@ -202,15 +202,20 @@ a.negative:active, button.negative:active {
 /* line 10, ../../app/stylesheets/application.scss */
 #try-link {
   font-family: verdana;
-  font-size: 24px;
+  font-size: 16px;
 }
 
 /* line 15, ../../app/stylesheets/application.scss */
 h1 {
-  font-size: 32px;
+  font-size: 24px;
+}
+
+/* line 16, ../../app/stylesheets/application.scss */
+strong {
+  font-weight: bold;
 }
 
-/* line 17, ../../app/stylesheets/application.scss */
+/* line 18, ../../app/stylesheets/application.scss */
 .center {
   margin: 0px auto 0px auto;
   text-align: center;