further work on bootstrap-variant

2026-05-18 01:39:01 +00:00 · 2012-06-21 16:49:25 +02:00
parent 92ff8e67ac
commit 371f1d8923
26 changed files with 71 additions and 68 deletions
--- a/.rvmrc
+++ b/.rvmrc
@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory

 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p290@rails3"
+environment_id="ruby-1.9.2-p290@opensnp"

 #
 # Uncomment following line if you want options to be set only for given project.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
  remote: https://github.com/norman/friendly_id.git
-  revision: 7ddf7ae5a23795e5d08c643c0ec68ed14bfa9e27
+  revision: e39e8e0cbdf3f64350aac14ad7ece85ecf824092
  specs:
-    friendly_id (4.0.8)
+    friendly_id (4.0.6)

 GIT
  remote: https://github.com/paulasmuth/recommendify.git
@@ -13,7 +13,7 @@ GIT

 GIT
  remote: https://github.com/ryanb/nested_form.git
-  revision: 504985118c2205f36e42417e6d99cecf23385290
+  revision: 1cbf61517348c701e08beea41a39f04b35115e6b
  specs:
    nested_form (0.2.1)

@@ -52,9 +52,11 @@ GEM
    activesupport (3.0.10)
    archive-tar-minitar (0.5.2)
    arel (2.0.10)
-    authlogic (3.1.3)
+    authlogic (3.1.2)
      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)
@@ -63,7 +65,7 @@ GEM
    erubis (2.6.6)
      abstract (>= 1.0.0)
    escape (0.0.4)
-    factory_girl (3.4.2)
+    factory_girl (3.3.0)
      activesupport (>= 3.0.0)
    i18n (0.5.0)
    jquery-rails (1.0.19)
@@ -84,7 +86,7 @@ GEM
    mime-types (1.18)
    mocha (0.11.4)
      metaclass (~> 0.0.1)
-    nokogiri (1.5.4)
+    nokogiri (1.5.3)
    paperclip (2.7.0)
      activerecord (>= 2.3.0)
      activesupport (>= 2.3.2)
@@ -143,7 +145,7 @@ GEM
      archive-tar-minitar (>= 0.5.2)
    rubyzip (0.9.5)
    shoulda-context (1.0.0)
-    shoulda-matchers (1.2.0)
+    shoulda-matchers (1.1.0)
      activesupport (>= 3.0.0)
    sinatra (1.2.8)
      rack (~> 1.1)
--- a/app/views/genotypes/_form.html.erb
+++ b/app/views/genotypes/_form.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
- <div class="span8 columns">
+ <div class="span6 columns">
 <%= form_for(@genotype,:html => {:class => "form-stacked", :multipart => true}) do |f| %>
 <%= render 'shared/error_messages', :target => @genotype %>
 <div class="well">	
@@ -41,7 +41,7 @@
 	</div>
 </div>
 <div class="actions">
-	<%= f.submit "Upload", :class => "primary btn"  %>
+	<%= f.submit "Upload", :class => "btn btn-primary"  %>
 </div>
 <% end %>
 </div>
--- a/app/views/genotypes/index.html.erb
+++ b/app/views/genotypes/index.html.erb
@@ -10,7 +10,7 @@
 <%end%>
 <h5><a href="https://github.com/superbobry/snpy">Python-library to parse the provided files</a>, courtesy of <a href="https://github.com/superbobry/">Sergei Lebedev</a></h5>

-<table class="zebra-striped" id="all_genotypes">
+<table class="table table-striped" id="all_genotypes">
 <thead>
 <tr>
    <th>#</th>
--- a/app/views/index/index.html.erb
+++ b/app/views/index/index.html.erb
@@ -1,7 +1,7 @@
 <div class="leftside">
 	<h1>Welcome to <em>openSNP</em></h1>
 		<p><%=image_tag "/images/microarray.png",:style => "float:left;margin: 10px"%></p>
-		<p><h7><em>openSNP</em> 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.</h7></p> <center><a href="/signup" class="btn large primary">Sign Up!</a></center><br/><br/>
+		<p><h7><em>openSNP</em> 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.</h7></p> <center><a href="/signup" class="btn btn-primary btn-large">Sign Up!</a></center><br/><br/>
 		<div id="tab-container"> 
 			<ul class="nav nav-tabs"> 
 				<li><a href="#dtcustomers">For Genotyping Users</a></li> 
@@ -41,21 +41,21 @@
 			<div class="row">
 				<div class="span5 columns offset">
 				<div class="alert-message block-message success" data-alert="alert">
-					<h5>Search for phenotypes</h5>
+					<h4 class="alert-heading">Search for phenotypes</h4>
 					<%=image_tag("/images/phenotypesearch.png")%>
 					Many diseases and traits are suspected to have genetical components. Genome Wide Association Studies are a simple tool find genetic markers. Easily find people with the variation you are interested in via openSNP.<br/><br/>The variation you are looking for is not entered yet? Just add it to <em>openSNP</em> 
 					</div>
 					</div>
 					<div class="span5 columns">
 					<div class="alert-message block-message success" data-alert="alert">
-					<h5>Easily download datasets</h5>
+					<h4 class="alert-heading">Easily download datasets</h4>
 					<%=image_tag("/images/filedownload.png")%>
 					The mass download-function of <em>openSNP</em> allows you to easily download the full genotyping raw-data in the file formats that are provided by <em>23andMe</em> and <em>deCODEme</em>.<br/><br/>As the files can be grouped by their variations for specific phenotypes it is easy to get datasets that are already usable for association studies. 
 					</div>
 					</div>
 					<div class="span5 columns">
 					<div class="alert-message block-message success" data-alert="alert">
-					<h5>Get notified about new data</h5>
+					<h4 class="alert-heading">Get notified about new data</h4>
 					<%=image_tag("/images/rss.png")%>
 					<em>openSNP</em> delivers a RSS-feed for each phenotype. So you can easily get all new datasets that get available for the phenotypes of your interest, without the need to check for new entries by hand.<br/><br/>For all data junkies that need more data: There is also a feed that carries all new datasets. 
 					</div>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -33,7 +33,7 @@
 			<ul class="nav secondary-nav"> 
 				<% if current_user %>
 					<li class="dropdown">
-					<a href="#" class="dropdown-toggle"><%= image_tag current_user.avatar.url(:head),:style => "vertical-align:middle"%> <%= current_user.name %></a>
+					<a href="#" class="dropdown-toggle"><%= image_tag current_user.avatar.url(:head),:style => "vertical-align:middle"%> <%= current_user.name %><b class="caret"></b></a>
 					<ul class="dropdown-menu">
 					<li><%= link_to("Settings",  :controller => "users", :action => "edit",:id => current_user) %></li>
 					<li><%= link_to("Edit Your Phenotypes", "/users/"+current_user.id.to_s+"/edit#phenotypes")%>
@@ -56,35 +56,35 @@
 <div class="container">
 	<%if current_user %>
 	<%unless (current_user.help_one or current_user.has_sequence) && (current_user.help_two or current_user.user_phenotypes != []) && (current_user.help_three or current_user.phenotype_creation_counter != 0) == true%>
-	<div class ="well">
+	<div class ="alert alert-block alert-success">
 	<div class="row">
-			<center><h4>Welcome to openSNP. Here are some first steps you could do:</h4></center>
+			<center><h3>Welcome to openSNP. Here are some first steps you could do:</h3></center>
 			<%if current_user.has_sequence == false and current_user.help_one == false%>
-			<div class="span5 columns offset1">
+			<div class="span3 offset1">
 			<div class="alert-message block-message success" data-alert="alert">
 				<%=link_to(raw("&times;"),{:controller => "users", :action => "remove_help_one", :id => current_user},:remote => true, id: "remove_help_one", :class => "close")%>
-				<h5>Upload Your Genotyping File</h5>
-				<%=link_to(image_tag("/images/fileupload.png"), "/genotypes/new")%>
+				<h4 class="alert-heading">Upload Your Genotyping File</h4>
+				<%=link_to(image_tag("/images/fileupload.png"), "/genotypes/new")%><br/>
 				<%=link_to("Upload the genotyping raw-data you got","/genotypes/new")%> from <em>23andMe</em> or <em>deCODEme</em> to the database of <em>openSNP</em> to share it with other personal genomics customers and scientists from all over the world. 
 			</div>
 			</div>
 			<%end%>
 			<%if current_user.user_phenotypes == [] and current_user.help_two == false%>
-			<div class="span5 columns">
+			<div class="span3 offset1">
 			<div class="alert-message block-message success" data-alert="alert">
 				<%=link_to(raw("&times;"),{:controller => "users", :action => "remove_help_two", :id => current_user},:remote => true, id: "remove_help_two", :class => "close")%>
-				<h5>Enter Your Variations</h5>
-				<%=link_to(image_tag("/images/phenotypes.png"), "/users/"+current_user.id.to_s+"#unentered_variations")%>
+				<h4 class="alert-heading">Enter Your Variations</h4>
+				<%=link_to(image_tag("/images/phenotypes.png"), "/users/"+current_user.id.to_s+"#unentered_variations")%><br/>
 				Let us, and the other <em>openSNP</em>-users, know some of your characteristics. Like hair or eye color. Or about some diseases? <%=link_to("Whatever you feel like sharing","/users/"+current_user.id.to_s+"#unentered_variations")%>.
 			</div>
 			</div>
 			<%end%>
 			<%if current_user.phenotype_creation_counter == 0 and current_user.help_three == false %>
-			<div class="span5 columns">
+			<div class="span3 offset1">
 			<div class="alert-message block-message success" data-alert="alert">
 				<%=link_to(raw("&times;"),{:controller => "users", :action => "remove_help_three", :id => current_user},:remote => true, id: "remove_help_three", :class => "close")%>
-				<h5>Enter a New Phenotype</h5>
-				<%=link_to(image_tag("/images/addphenotype.png"), "/phenotypes/new")%>
+				<h4 class="alert-heading">Enter a New Phenotype</h4>
+				<%=link_to(image_tag("/images/addphenotype.png"), "/phenotypes/new")%><br/>
 				Got an idea for a phenotype that has not been asked about yet and that could have genetical roots? <%=link_to("Great, you can easily add this","/phenotypes/new")%> to the <em>openSNP</em>-database.
 			</div>
 			</div>
@@ -96,28 +96,29 @@
 	<%end%>

 <div class="container" id="alert-messages">
-		<div id="flash_notice" class="alert-message success" style="display:none"></div>
+		<div id="flash_notice" class="alert alert-success" style="display:none"></div>
 		<% if flash[:notice] %>
-			<div class="alert-message success" data-alert="alert">
+			<div class="alert alert-success" data-alert="alert">
 				<a class="close" href="#">x</a>
-				<p><%= flash[:notice] %></p>
+				<strong><%= flash[:notice] %></strong>
 			</div> 
 		<% end %>
 		<% if flash[:warning] %>
-			<div class="alert-message error" data-alert="alert">
+			<div class="alert alert-error" data-alert="alert">
 				<a class="close" href="#">x</a>
-				<p><%= flash[:warning] %></p>
+				<strong><%= flash[:warning] %></strong>
 			</div> 
 		<% end %>
 		<% if flash[:achievement] %>
-			<div class="alert-message info" data-alert="alert">
+			<div class="alert alert-info" data-alert="alert">
 				<a class="close" href="#">x</a>
-				<p><%= flash[:achievement] %></p>
+				<strong><%= flash[:achievement] %></strong>
 			</div>
 		<% end %>
 	<%= yield %>
 </div>
 </div>
+<hr />
 <footer class="footer">
      <div class="container">
        <p>
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -19,6 +19,6 @@
 		</div>
 	</div>
 	<div class="actions">
-		<%= f.submit "Send", :class => "primary btn"%>
+		<%= f.submit "Send", :class => "btn btn-primary"%>
 </div>
 <% end %>
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -1,6 +1,6 @@
 <h1>News</h1>
 <div id="tab-container">
-<ul class="tabs">
+<ul class="nav nav-tabs">
 	<li><a href="#general">On openSNP</a></li>
 	<li><a href="#users">New users</a></li>
 	<li><a href="#genotypes">New genotypes</a></li>
@@ -57,7 +57,7 @@ Hello everyone! We've implemented a minor change, you can now access SNPs over t
 <%=auto_discovery_link_tag(:rss,"/rss", {:title => "RSS for all genotypes"})%>
 <h2>Genotypes</h2>
 <%=link_to(image_tag("/images/rss_small.png"),"/rss")%>
-<table class="common-table zebra-striped">
+<table class="table table-striped">
 <tr>
    <th>#</th>
 	<th>Genotype-ID</th>
@@ -80,7 +80,7 @@ Hello everyone! We've implemented a minor change, you can now access SNPs over t
 </div>
 <div id="users">
 <h2>Users</h2>
-<table class="common-table zebra-striped">
+<table class="table table-striped">
 	<tr>
        <td>#</th>
 		<th>ID</th>
@@ -101,7 +101,7 @@ Hello everyone! We've implemented a minor change, you can now access SNPs over t
 </div>
 <div id="phenotypes">
 <h2>Phenotypes</h2>
-<table class="common-table zebra-striped">
+<table class="table table-striped">
 	<tr>
 		<th>Name</th>
 		<th>Variations</th>
@@ -119,7 +119,7 @@ Hello everyone! We've implemented a minor change, you can now access SNPs over t

 <div id="phenotypecomments">
 <h2>Phenotype Comments</h2>
-<table class="common-table zebra-striped">
+<table class="table table-striped">
 	<tr>
 		<th>Phenotype</th>
 		<th>Comment By</th>
@@ -141,7 +141,7 @@ Hello everyone! We've implemented a minor change, you can now access SNPs over t

 <div id="snpcomments">
 <h2>SNP Comments</h2>
-<table class="common-table zebra-striped">
+<table class="table table-striped">
 	<tr>
 		<th>SNP</th>
 		<th>Comment By</th>
@@ -163,7 +163,7 @@ Hello everyone! We've implemented a minor change, you can now access SNPs over t
 <%=link_to(image_tag("/images/rss_small.png"),"/paper/rss")%>
 <%=auto_discovery_link_tag(:rss,"/paper/rss", {:title => "RSS for latest publications"})%>
 	<h2>Latest publications</h2>
-	<table class="common-table zebra-striped">
+	<table class="table table-striped">
 		<tr>
 			<th>SNP</th>
 			<th>Author</th>
--- a/app/views/password_resets/new.html.erb
+++ b/app/views/password_resets/new.html.erb
@@ -6,5 +6,5 @@ Fill out the form below and instructions to reset your password will be emailed
 <% form_tag password_resets_path do %>
  <label>Email:</label>
  <%= text_field_tag "email" %>
-  <%= submit_tag "Reset my password", :class => "primary btn"  %>
+  <%= submit_tag "Reset my password", :class => "btn btn-primary"  %>
 <% end %>
--- a/app/views/phenotype_comments/_form.html.erb
+++ b/app/views/phenotype_comments/_form.html.erb
@@ -12,6 +12,6 @@
 	<%= f.text_area :comment_text, :size => "20x5" %>
 </div>

-	<%= f.submit "Comment", :class => "primary btn"  %>
+	<%= f.submit "Comment", :class => "btn btn-primary"  %>
 <% end %>
 </div>
--- a/app/views/phenotypes/get_genotypes.html.erb
+++ b/app/views/phenotypes/get_genotypes.html.erb
@@ -1,5 +1,5 @@
 <h3>Your Download can start soon...</h3>

-<div class="alert-message block-message success">
+<div class="alert alert-block alert-success">
 <%=image_tag("/images/filedownload.png",:style => "float:left")%><h7>Our servers are working hard to deliver you a file that includes all the genotyping files of users with a variation of <em><%=@variation%></em> at the phenotype <em><%=@phenotype.characteristic%></em>.<br/><br/>The genotyping-files currently get zipped to lighten your download. You will receive the download-link via the eMail-address you registered your account with, as soon as the file is ready.</h7></div>
 <%=link_to "Go Back","/phenotypes/"+@phenotype.id.to_s%>
--- a/app/views/phenotypes/index.html.erb
+++ b/app/views/phenotypes/index.html.erb
@@ -1,6 +1,6 @@
 <h1>Listing all Phenotypes</h1>
 		<%if current_user%><div class="row"><div class="span10 columns offset6"><h5><%=link_to(image_tag("/images/addphenotype_small.png",:style => "vertical-align:middle" ),:action =>"new")%> <%=link_to "The phenotype of your interest is missing? Add a new one!",:action => "new"%></h5></div></div><%end%>
-<table class="zebra-striped" id="no_snp_overview">
+<table class="table table-striped" id="no_snp_overview">
 <thead>
 <tr>
 	<th>#</th>
--- a/app/views/phenotypes/new.html.erb
+++ b/app/views/phenotypes/new.html.erb
@@ -29,5 +29,5 @@
 	</div>
 </div>

-<%= f.submit :class => "primary btn" %>
+<%= f.submit :class => "btn btn-primary" %>
 <% end %>
--- a/app/views/phenotypes/recommend_phenotype.html.erb
+++ b/app/views/phenotypes/recommend_phenotype.html.erb
@@ -19,7 +19,7 @@ Below you find <%=@similar_phenotypes.size%> <%if @similar_phenotypes.size > 1%>
 <div class="row">
 <%@similar_phenotypes.each do |s|%>
 	<div class="span<%=(16/@similar_phenotypes.size).to_i%> columns">
-		<div class="alert-message block-message success" data-alert="alert">
+		<div class="alert alert-block alert-success" data-alert="alert">
 		<h6><%=link_to s.characteristic,s%></h6>
 		Description: <em><%=s.description%></em>
 		</div>
--- a/app/views/phenotypes/show.html.erb
+++ b/app/views/phenotypes/show.html.erb
@@ -25,7 +25,7 @@
  </ul>

  <div id="tab-container">
-    <ul class="tabs">
+    <ul class="nav nav-tabs">
      <li><a href="#description">Description</a></li>
 	  <li><a href="#similar">Similar phenotypes</a></li>
      <li><a href="#users">Users sharing this phenotype (<%=@phenotype.user_phenotypes.length%>)</a></li>
@@ -38,7 +38,7 @@
      </div>
    </div>
    <div id="users">
-      <table class="zebra-striped">
+      <table class="table table-striped">
        <tr>
          <th>User</th>
          <th>Variation</th>
@@ -65,7 +65,7 @@
        </div>

 <div id="similar">
-<table class="zebra-striped">
+<table class="table table-striped">
 	<tr>
 		<th>Phenotype</th>
 		<th>Number of Users</th>
--- a/app/views/shared/_error_messages.html.erb
+++ b/app/views/shared/_error_messages.html.erb
@@ -1,5 +1,5 @@
 <% if target.errors.any? %>
-	<div class="alert-message block-message error">
+	<div class="alert alert-block alert-error">
 			<% target.errors.full_messages.each do |msg| %>
                <%= msg %><br/>
 			<% end %>
--- a/app/views/shared/_warning.html.erb
+++ b/app/views/shared/_warning.html.erb
@@ -1,6 +1,6 @@
 <div class="row">
-<div class="span14 columns offset1">
-<div class="alert-message block-message error">
+<div class="span12">
+<div class="alert alert-block alert-error">
 	<p><strong>Important:</strong> Please carefully read the disclaimer on the right-hand side.</p>  
 </div>
 </div>
--- a/app/views/static/_disclaimer.html.erb
+++ b/app/views/static/_disclaimer.html.erb
@@ -1,4 +1,4 @@
-<div class="span8 columns">
+<div class="span6 columns">
 	<div class="well">
 		<p><strong>By signing up for openSNP you declare that you have understood the possible risks and side-effects that can occur by making your genetical and medical information available on this platform. In short:</strong><br/><br/></p>
 		<p><ul>
--- a/app/views/static/_faq.html.erb
+++ b/app/views/static/_faq.html.erb
@@ -1,6 +1,6 @@
 <h3>Frequently Asked Questions</h3>
 <div id="tab-container">
-  <ul class="tabs">
+  <ul class="nav nav-tabs">
    <li><a href="#dtcustomers"><%=image_tag("/images/fileupload_small.png",:style => "vertical-align:middle" )%> Uploading data</a></li>
    <li><a href="#scientists"><%=image_tag("/images/filedownload_small.png",:style => "vertical-align:middle" )%> Downloading data</a></li>
 	<li><a href="#enteringphenotypes"><%=image_tag("/images/add_variation_small.png",:style => "vertical-align:middle")%> Entering phenotypes</a></li>
--- a/app/views/users/_edit.html.erb
+++ b/app/views/users/_edit.html.erb
@@ -3,7 +3,7 @@
 <%= render 'shared/error_messages', :target => @user %>
 <div id="post_errors" style="display:none"></div>
 <div id="tab-container">
-  <ul class="tabs">
+  <ul class="nav nav-tabs">
    <li><a href="#general">General</a></li>
    <li><a href="#phenotypes">Phenotypes</a></li>
    <li><a href="#details">Details</a></li>
@@ -118,6 +118,6 @@


 <div class="actions">
-	<%= f.submit "Update Information", :class => "primary btn", :id => "update_user" %>
+	<%= f.submit "Update Information", :class => "btn btn-primary", :id => "update_user" %>
 </div>
 <% end %> 
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
- <div class="span8 columns">
+ <div class="span6 columns">
 <% # helper thing so we don't have to put up fields into every page %>
 <div class="well">
 <%= form_for @user, :html => {:class => "form-stacked"} do |f| %>
--- a/app/views/users/_user_is_not_user.html.erb
+++ b/app/views/users/_user_is_not_user.html.erb
@@ -40,7 +40,7 @@
 <% end %>
 </p>
 <div id="tab-container">
-	<ul class="tabs">
+	<ul class="nav nav-tabs">
 		<% if 1==2  %><li><a href="#snps"><%=@first_name%>'s SNPs</a></li><% end %>
 		<li><a href="#variations"><%= @first_name %>'s variations</a></li>
 	</ul>
--- a/app/views/users/_user_is_user.html.erb
+++ b/app/views/users/_user_is_user.html.erb
@@ -24,7 +24,7 @@
 	<% end %>

 <div id="tab-container">
-	<ul class="tabs">
+	<ul class="nav nav-tabs">
 		<%if @unentered_phenotypes != []%>
 		<li><a href="#unentered_variations">Variations you did not enter yet (<%=@unentered_phenotypes.length%>)</a></li>
 		<%end%>
@@ -139,7 +139,7 @@
 <% if @paginated_phenotype_replies != [] %>
 <h4>Latest replies on your comments on Phenotypes</h4>

-	<table class="zebra-striped" id="phenotype_reply_comments">
+	<table class="table table-striped" id="phenotype_reply_comments">
 		<thead>
 		<tr>
 		<th>On Phenotype</th>
@@ -166,7 +166,7 @@

 <% if @paginated_snp_replies != [] %>
 <h4>Latest replies on your comments on SNPs</h4>
-	<table class="zebra-striped" id="snp_reply_comments">
+	<table class="table table-striped" id="snp_reply_comments">
 		<thead>
 		<tr>
 			<th>On SNP</th>
--- a/app/views/users/_variations.html.erb
+++ b/app/views/users/_variations.html.erb
@@ -1,4 +1,4 @@
-<table class="common-table zebra-striped">
+<table class="table table-striped">
 	<tr>
 		<th>Characteristic</th>
 		<th>Variation</th>
--- a/app/views/users/changepassword.html.erb
+++ b/app/views/users/changepassword.html.erb
@@ -1,6 +1,6 @@
 <h3>Change your email-address and password</h3>
 <div class="row">
- <div class="span8 columns">
+ <div class="span12 columns">
 <% # helper thing so we don't have to put up fields into every page %>
 <div class="well">
 <%= form_for @user, :html => {:class => "form-stacked"} do |f| %>
@@ -22,7 +22,7 @@
 </div>

 <div class="actions">
-	<%= f.submit "Update Information",:class => "primary btn"%>
+	<%= f.submit "Update Information",:class => "btn btn-primary"%>
 </div>
 <% end %> 
 </div>
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,6 +1,6 @@
 <div class="row">
-	<div class="span10"><h1>Edit your details</h1></div>
-	<div class="span6"><%= link_to 'Back Home', current_user %></div>
+	<div class="span8"><h1>Edit your details</h1></div>
+	<div class="span4"><%= link_to 'Back Home', current_user %></div>
 </div>
 <%= render 'edit' %>