Commit 914ca22e

mo k <m@mokhan.ca>
2012-02-11 07:20:35
fix up the sign in page so that it fits in the 12 col system. sorry luu the 16 col just didn't work.
master
1 parent 1677fbd
Changed files (2)
app
views
devise
sessions
new.html.erb
layouts
blank.html.erb
app/views/devise/sessions/new.html.erb
@@ -16,28 +16,28 @@
 </script>
 
 <div class="row">
-  <div class="span16">
+  <div class="span12">
     <div class="row">
-      <div class="span8 offset2">
+      <div class="span7">
         <div class="logo"><img src="/assets/cakeside-logo.png" width="100%" alt="cakeside logo"/></div>
       </div>
-      <div class="span5 offset1">
+      <div class="span5">
         <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
           <fieldset style="padding-top:118px;">
             <%= f.email_field :email, :placeholder => 'Email', :size => 20, :class=> "span2" %>
             <%= f.password_field :password, :placeholder => 'Password',:size => 20 , :class=> "span2" %>
-            <%= f.submit "Sign In", :class => "btn" %>
+            <%= f.submit "Sign In", :class => "btn" %><br />
             <%= f.check_box :remember_me %> Remember me
             <%= link_to "Forgot it?", new_password_path(resource_name) %>
           </fieldset>
         <% end %>
       </div>
     </div>
-    <div class="row"> <div class="span16">&nbsp;</div> </div>
-    <div class="row"> <div class="span16">&nbsp;</div> </div>
-    <div class="row"> <div class="span16">&nbsp;</div> </div>
+    <div class="row"> <div class="span12">&nbsp;</div> </div>
+    <div class="row"> <div class="span12">&nbsp;</div> </div>
+    <div class="row"> <div class="span12">&nbsp;</div> </div>
     <div class="row">
-      <div class="span10"> 
+      <div class="span7"> 
         <% if notice %><p class="alert-message success"><%= notice %></p> <% end %>
         <% if alert %><p class="alert-message error"><%= alert %></p><% end %>
         <%= devise_error_messages! %>
@@ -46,7 +46,7 @@
         <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="http://cakeside.wufoo.com/forms/z7x3k1/" target="_blank">feedback</a>. Check back often to see what's new in the CakeSide community!</p>
       </div>
-      <div class="span5 offset1">
+      <div class="span5">
         <h3>New to CakeSide? <em>Join Us!</em></h3>
         <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
           <p><%= f.text_field :name, :placeholder => 'Full name', :class =>"xlarge"%></p>
app/views/layouts/blank.html.erb
@@ -8,7 +8,7 @@
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
   </head>
-  <body style="background: #FFFFFF;">
+  <body style="background: pink;">
     <div style="background: url(/assets/sunset.png) no-repeat center 0px;">
       <div class="container">
         <div class="content">
@@ -39,7 +39,7 @@
             <li> <a href="/"></a> </li>
           </ul>
         </div>
-        <div class="span8"></div>
+        <div class="span4"></div>
       </div>
     </div>		
     <div id="footer-floor">		
@@ -48,8 +48,6 @@
           <div class="span12">
             <p>Copyright &copy; 2012 CakeSide Inc. | <a href="/terms.html"> Terms</a> &amp; <a href="/privacy.html"> Privacy</a> | Contact Us <a href="http://twitter.com/cakeside">@cakeside</a> | <a href="https://www.facebook.com/pages/CakeSide/214607468615074">facebook</a></p>
           </div>
-          <div class="span4">
-          </div>
         </div>
       </div>
     </div>