From 92ff8e67ac55992bf120e6cfa1ceac2f91766191 Mon Sep 17 00:00:00 2001 From: Bastian Greshake Date: Wed, 20 Jun 2012 22:44:55 +0200 Subject: [PATCH 01/55] started transfer to bootstrap 2.x --- Gemfile.lock | 16 +- app/views/index/index.html.erb | 34 ++- app/views/layouts/application.html.erb | 16 +- db/schema.rb | 6 +- public/stylesheets/bootstrap-1.2.0.min.css | 280 +-------------------- 5 files changed, 42 insertions(+), 310 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a0dd55b..3615f38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: https://github.com/norman/friendly_id.git - revision: e39e8e0cbdf3f64350aac14ad7ece85ecf824092 + revision: 7ddf7ae5a23795e5d08c643c0ec68ed14bfa9e27 specs: - friendly_id (4.0.6) + friendly_id (4.0.8) GIT remote: https://github.com/paulasmuth/recommendify.git @@ -13,7 +13,7 @@ GIT GIT remote: https://github.com/ryanb/nested_form.git - revision: 1cbf61517348c701e08beea41a39f04b35115e6b + revision: 504985118c2205f36e42417e6d99cecf23385290 specs: nested_form (0.2.1) @@ -52,11 +52,9 @@ GEM activesupport (3.0.10) archive-tar-minitar (0.5.2) arel (2.0.10) - authlogic (3.1.2) + authlogic (3.1.3) activerecord (>= 3.0.0) - activerecord (>= 3.0.7) activesupport (>= 3.0.0) - activesupport (>= 3.0.7) bartt-ssl_requirement (1.4.2) bcrypt-ruby (3.0.1) builder (2.1.2) @@ -65,7 +63,7 @@ GEM erubis (2.6.6) abstract (>= 1.0.0) escape (0.0.4) - factory_girl (3.3.0) + factory_girl (3.4.2) activesupport (>= 3.0.0) i18n (0.5.0) jquery-rails (1.0.19) @@ -86,7 +84,7 @@ GEM mime-types (1.18) mocha (0.11.4) metaclass (~> 0.0.1) - nokogiri (1.5.3) + nokogiri (1.5.4) paperclip (2.7.0) activerecord (>= 2.3.0) activesupport (>= 2.3.2) @@ -145,7 +143,7 @@ GEM archive-tar-minitar (>= 0.5.2) rubyzip (0.9.5) shoulda-context (1.0.0) - shoulda-matchers (1.1.0) + shoulda-matchers (1.2.0) activesupport (>= 3.0.0) sinatra (1.2.8) rack (~> 1.1) diff --git a/app/views/index/index.html.erb b/app/views/index/index.html.erb index 9d2fac7..d224721 100644 --- a/app/views/index/index.html.erb +++ b/app/views/index/index.html.erb @@ -3,7 +3,7 @@

<%=image_tag "/images/microarray.png",:style => "float:left;margin: 10px"%>

openSNP allows customers of direct-to-customer genetic tests to publish their test results, find others with similar genetic variations, learn more about their results, find the latest primary literature on their variations and help scientists to find new associations.

Sign Up!


-