correct padding in user, keys, password forms

app/views/admin/users/_form.html.haml

@@ -7,41 +7,39 @@
           - @admin_user.errors.full_messages.each do |msg|
             %li= msg
 
-    .span-24
-      .span-11.colborder
-        .field
+    .form-row
       = f.label :name
       %br
       = f.text_field :name
-        .field
+    .form-row
       = f.label :email
       %br
       = f.text_field :email
-        .field
+    .form-row
       = f.label :password
       %br
       = f.password_field :password
-        .field
+    .form-row
       = f.label :password_confirmation
       %br
       = f.password_field :password_confirmation
-        .field.prepend-top
+    .form-row
       = f.check_box :admin
       = f.label :admin
-      .span-11
-        .field.prepend-top
+
+    .form-row
       = f.text_field :projects_limit, :class => "small_input"
       = f.label :projects_limit
 
-        .field
+    .form-row
       = f.label :skype
       %br
       = f.text_field :skype
-        .field
+    .form-row
       = f.label :linkedin
       %br
       = f.text_field :linkedin
-        .field
+    .form-row
       = f.label :twitter
       %br
       = f.text_field :twitter

app/views/admin/users/index.html.haml

@@ -21,4 +21,5 @@
 %br
 
 = paginate @admin_users
+
 = link_to 'New User', new_admin_user_path

app/views/keys/_form.html.haml

@@ -5,12 +5,12 @@
         - @key.errors.full_messages.each do |msg|
           %li= msg
 
-    .span-6
+    .form-row
       = f.label :title
       = f.text_field :title, :style => "width:300px"
-    .span-6
+    .form-row
       = f.label :key
       = f.text_area :key, :style => "width:300px; height:130px"
-    .span-6
+    .form-row
       = f.submit 'Save', :class => "lbutton vm"
 

app/views/profile/password.html.haml

@@ -7,11 +7,11 @@
         - @user.errors.full_messages.each do |msg|
           %li= msg
 
-  .div
+  .form-row
     = f.label :password
     %br
     = f.password_field :password
-  .div
+  .form-row
     = f.label :password_confirmation
     %br
     = f.password_field :password_confirmation