Skip to content

Commit

Permalink
update twitter bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Wilson committed Oct 14, 2011
1 parent a6983e1 commit 35078c8
Show file tree
Hide file tree
Showing 18 changed files with 531 additions and 254 deletions.
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.0.rc3'
gem 'rails', '3.1.1'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand Down
161 changes: 81 additions & 80 deletions Gemfile.lock
@@ -1,143 +1,144 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.0.rc3)
actionpack (= 3.1.0.rc3)
actionmailer (3.1.1)
actionpack (= 3.1.1)
mail (~> 2.3.0)
actionpack (3.1.0.rc3)
activemodel (= 3.1.0.rc3)
activesupport (= 3.1.0.rc3)
actionpack (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.0)
rack-cache (~> 1.0.1)
rack-mount (~> 0.8.1)
rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.10)
tzinfo (~> 0.3.27)
activemodel (3.1.0.rc3)
activesupport (= 3.1.0.rc3)
bcrypt-ruby (~> 2.1.4)
rack (~> 1.3.2)
rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.2)
activemodel (3.1.1)
activesupport (= 3.1.1)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.0.rc3)
activemodel (= 3.1.0.rc3)
activesupport (= 3.1.0.rc3)
arel (~> 2.1.1)
tzinfo (~> 0.3.27)
activeresource (3.1.0.rc3)
activemodel (= 3.1.0.rc3)
activesupport (= 3.1.0.rc3)
activesupport (3.1.0.rc3)
activerecord (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
activeresource (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
activesupport (3.1.1)
multi_json (~> 1.0)
ansi (1.2.5)
arel (2.1.1)
bcrypt-ruby (2.1.4)
addressable (2.2.6)
ansi (1.3.0)
arel (2.2.1)
bcrypt-ruby (3.0.1)
builder (3.0.0)
cancan (1.6.5)
capybara (1.0.0)
cancan (1.6.7)
capybara (1.1.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 0.2.0)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.1.9)
childprocess (0.2.2)
ffi (~> 1.0.6)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.1)
configuration (1.3.1)
cucumber (1.0.1)
coffee-script-source (1.1.2)
cucumber (1.1.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.4.5)
gherkin (~> 2.5.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
cucumber-rails (1.0.2)
capybara (>= 1.0.0)
cucumber (~> 1.0.0)
nokogiri (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (1.1.1)
capybara (>= 1.1.1)
cucumber (>= 1.1.0)
nokogiri (>= 1.5.0)
database_cleaner (0.6.7)
diff-lcs (1.1.2)
diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.1.2)
execjs (1.2.9)
multi_json (~> 1.0)
ffi (1.0.9)
gherkin (2.4.5)
gherkin (2.5.2)
json (>= 1.4.6)
haml (3.1.2)
haml (3.1.3)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
hike (1.0.0)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (1.0.9)
jquery-rails (1.0.16)
railties (~> 3.0)
thor (~> 0.14)
json (1.5.1)
json_pure (1.5.1)
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
json (1.6.1)
json_pure (1.6.1)
launchy (2.0.5)
addressable (~> 2.2.6)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
multi_json (1.0.3)
mysql2 (0.3.2)
mysql2 (0.3.7)
nokogiri (1.5.0)
polyglot (0.3.1)
rack (1.3.0)
rack-cache (1.0.2)
polyglot (0.3.2)
rack (1.3.4)
rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.1)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.0)
rack-test (0.6.1)
rack (>= 1.0)
rails (3.1.0.rc3)
actionmailer (= 3.1.0.rc3)
actionpack (= 3.1.0.rc3)
activerecord (= 3.1.0.rc3)
activeresource (= 3.1.0.rc3)
activesupport (= 3.1.0.rc3)
rails (3.1.1)
actionmailer (= 3.1.1)
actionpack (= 3.1.1)
activerecord (= 3.1.1)
activeresource (= 3.1.1)
activesupport (= 3.1.1)
bundler (~> 1.0)
railties (= 3.1.0.rc3)
railties (3.1.0.rc3)
actionpack (= 3.1.0.rc3)
activesupport (= 3.1.0.rc3)
railties (= 3.1.1)
railties (3.1.1)
actionpack (= 3.1.1)
activesupport (= 3.1.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
rdoc (3.10)
json (~> 1.4)
rubyzip (0.9.4)
sass (3.1.2)
selenium-webdriver (0.2.2)
childprocess (>= 0.1.9)
sass (3.1.10)
selenium-webdriver (2.8.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
shoulda (2.11.3)
sprockets (2.0.0.beta.10)
hike (~> 1.0)
sprockets (2.0.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.5)
tilt (!= 1.3.0, ~> 1.1)
term-ansicolor (1.0.7)
thor (0.14.6)
tilt (1.3.2)
treetop (1.4.9)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
turn (0.8.2)
ansi (>= 1.2.2)
tzinfo (0.3.27)
uglifier (0.5.4)
turn (0.8.3)
ansi
tzinfo (0.3.30)
uglifier (1.0.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
xpath (0.1.4)
Expand All @@ -160,7 +161,7 @@ DEPENDENCIES
launchy
multi_json
mysql2
rails (= 3.1.0.rc3)
rails (= 3.1.1)
sass
shoulda
turn
Expand Down
2 changes: 0 additions & 2 deletions app/assets/javascripts/application.js.coffee
@@ -1,4 +1,2 @@
$ ->
$('body').noisy { intensity: 0.9, size: 200, opacity: 0.08 }

$('div#flash_notice').fadeOut(2000)
84 changes: 0 additions & 84 deletions app/assets/stylesheets/application.css.scss

This file was deleted.

0 comments on commit 35078c8

Please sign in to comment.