Commit 8c12dd78

@@ -2,7 +2,7 @@
 <footer class="hidden-phone">
 <div class="container">
   <div class="row">
-    <div class="span4">
+    <div class="col">
       <h3>CakeSide</h3>
       <ul class="unstyled">
         <li> <%= link_to "Home", root_path %> </li>
@@ -10,7 +10,7 @@
         <li> <%= link_to "Why CakeSide?", why_cakeside_path %> </li>
       </ul>
     </div>
-    <div class="span4">
+    <div class="col">
       <h3>Contact Us</h3>
       <ul class="unstyled">
         <li> <a href="https://cakeside.uservoice.com/" target="_blank">Send Feedback</a> </li>
@@ -18,13 +18,13 @@
         <li> <a href="https://www.facebook.com/pages/CakeSide/214607468615074">Facebook</a> </li>
       </ul>
     </div>
-    <div class="span8"></div>
+    <div class="col"></div>
   </div>
 </div>		
 <div id="footer-floor">		
   <div class="container">
     <div class="row">
-      <div class="span12">
+      <div class="col">
         <p>
         Copyright &copy; 2013 CakeSide Inc. | 
         <a href="/terms.html">Terms</a> &amp; <a href="/privacy.html">Privacy</a> | 

@@ -12,60 +12,49 @@
   });
 </script>
 <% end %>
-<div class="row-fluid">
-  <div class="span12">
-    <div class="row-fluid">
-      <div class="span6 hidden-phone">
-        <%= image_tag "cakeside-logo.png" %>
-        <div style="padding-left:10px;padding-right:10px;">
-          <h3>Why CakeSide?</h3>
-          <p>CakeSide is a community dedicated to giving cake artists, bakers, creators, hobbyists, and of course cake lovers a place to share ideas and creations. Explore your creativity and find your inspiration. Resources shared here are all user driven.</p>
-          <h3>About Us</h3>
-          <p>We are a passionate team dedicated to improving the cake sharing experience. Frustrated with the lack of community that provides more than just photo sharing, CakeSide was born. All features of this site will be user inspired. We love to listen so feel free to give us <a href="https://cakeside.uservoice.com/" target="_blank">feedback</a>. Check back often to see what's new in the CakeSide community!</p>
-        </div>
+<div class="row">
+  <div class="col hidden-phone">
+    <%= image_tag "cakeside-logo.png" %>
+    <div style="padding-left:10px;padding-right:10px;">
+      <h3>Why CakeSide?</h3>
+      <p>CakeSide is a community dedicated to giving cake artists, bakers, creators, hobbyists, and of course cake lovers a place to share ideas and creations. Explore your creativity and find your inspiration. Resources shared here are all user driven.</p>
+      <h3>About Us</h3>
+      <p>We are a passionate team dedicated to improving the cake sharing experience. Frustrated with the lack of community that provides more than just photo sharing, CakeSide was born. All features of this site will be user inspired. We love to listen so feel free to give us <a href="https://cakeside.uservoice.com/" target="_blank">feedback</a>. Check back often to see what's new in the CakeSide community!</p>
+    </div>
+  </div>
+  <div class="col">
+    <%= form_for(@session, url: sessions_path(@session), html: { class: "form-horizontal" }) do |f| %>
+      <legend>Got an account? Login!</legend>
+      <div class="form-group">
+        <%= email_field_tag 'session[username]', '', placeholder: 'Email', class: "form-control" %>
       </div>
-      <div class="span6">
-        <%= form_for(@session, url: sessions_path(@session), html: { class: "well form-inline"}) do |f| %>
-          <legend>Got an account? Login!</legend>
-          <%= email_field_tag 'session[username]', '', :placeholder => 'Email', :class=> "input-medium" %>
-          <%= password_field_tag 'session[password]', '', :placeholder => 'Password', :class=> "input-medium" %>
-          <%= f.submit "Sign In", :class => "btn" %>
-          <br />
-          <p><%= link_to "Forgot your password?", new_password_path %></p>
-        <% end %>
-        <%= form_for(User.new, as: :user, url: registration_path, html: { :class=> 'form-horizontal' }) do |f| %>
-          <fieldset>
-            <legend>New to CakeSide? Join Us!</legend>
-          </fieldset>
-          <div class="control-group">
-            <%= f.label :name, 'Full name', :class => "control-label" %>
-            <div class="controls">
-              <%= f.text_field :name, :placeholder => 'required' %>
-            </div>
-          </div>
-          <div class="control-group">
-            <%= f.label :email, 'Email', :class => "control-label" %>
-            <div class="controls">
-              <%= f.email_field :email, :placeholder => 'required' %>
-            </div>
-          </div>
-          <div class="control-group">
-            <%= f.label :password, 'Password', :class => "control-label" %>
-            <div class="controls">
-              <%= f.password_field :password, :placeholder => 'required' %>
-            </div>
-          </div>
-          <div class="control-group">
-            <label for="accepted" class="control-label"></label>
-            <div class="controls">
-              <input id="accepted" name="accepted" type="checkbox" value="" checked="checked" /> I have read the <a href="/terms.html">terms and conditions</a> and the <a href="/privacy.html">privacy policy</a>
-            </div>
-          </div>
-          <div class="form-actions">
-            <%= f.submit "Sign up", :id => 'submit-registration', :class=> "btn btn-primary" %>
-          </div>
-        <% end %>
+      <div class="form-group">
+        <%= password_field_tag 'session[password]', '', placeholder: 'Password', class: "form-control" %>
       </div>
-    </div>
+      <p><%= link_to "Forgot your password?", new_password_path %></p>
+      <%= f.submit "Sign In", class: "btn btn-primary" %>
+      <br />
+    <% end %>
+    <%= form_for(User.new, as: :user, url: registration_path, html: { class: 'form-horizontal' }) do |f| %>
+      <fieldset>
+        <legend>New to CakeSide? Join Us!</legend>
+      </fieldset>
+      <div class="form-group">
+        <%= f.text_field :name, placeholder: 'Full name', class: 'form-control' %>
+      </div>
+      <div class="form-group">
+        <%= f.email_field :email, placeholder: 'Email', class: 'form-control' %>
+      </div>
+      <div class="form-group">
+        <%= f.password_field :password, placeholder: 'Password', class: 'form-control' %>
+      </div>
+      <div class="form-check">
+        <label>
+          <input id="accepted" name="accepted" type="checkbox" value="" />
+          I have read the <a href="/terms.html">terms and conditions</a> and the <a href="/privacy.html">privacy policy</a>
+        </label>
+      </div>
+      <%= f.submit "Register", id: 'submit-registration', class: "btn btn-primary" %>
+    <% end %>
   </div>
 </div>