Permalink
Browse files

Merge branch 'design' into infrastructure

  • Loading branch information...
2 parents d33df1b + 51cc791 commit 8d807ac2599c998c8068b3a4c953dea93b72be06 @justinsoliz committed Apr 29, 2012
View
3 app/assets/stylesheets/user.css.scss
@@ -1,3 +0,0 @@
-// Place all the styles related to the User controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
View
29 app/views/devise/registrations/new.html.erb
@@ -3,16 +3,29 @@
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
- <div><%= f.label :email %><br />
- <%= f.email_field :email %></div>
+ <div class="control-group">
+ <%= f.label :email, :class => 'control-label' %>
+ <div class="controls">
+ <%= f.text_field :email, :class => 'text_field' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <%= f.label :password, :class => 'control-label' %>
+ <div class="controls">
+ <%= f.password_field :password, :class => 'text_field' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <%= f.label :password_confirmation, :class => 'control-label' %>
+ <div class="controls">
+ <%= f.password_field :password, :class => 'text_field' %>
+ </div>
+ </div>
- <div><%= f.label :password %><br />
- <%= f.password_field :password %></div>
+ <div class="form-actions">
+ <%= f.submit nil, :class => 'btn btn-primary' %>
+ </div>
- <div><%= f.label :password_confirmation %><br />
- <%= f.password_field :password_confirmation %></div>
-
- <div><%= f.submit "Sign up" %></div>
<% end %>
<%= render "links" %>
View
7 app/views/devise/sessions/new.html.erb
@@ -1,7 +1,8 @@
<h2>Sign in</h2>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
- <div><%= f.label :email %><br />
+
+ <div><%= f.label :email %><br />
<%= f.email_field :email %></div>
<div><%= f.label :password %><br />
@@ -12,6 +13,8 @@
<% end -%>
<div><%= f.submit "Sign in" %></div>
+
<% end %>
-<%= render "links" %>
+<%= render "links" %>
+
View
9 app/views/layouts/application.html.haml
@@ -20,11 +20,16 @@
= link_to "MySpot", root_path, :class => 'brand'
.container.nav-collapse
%ul.nav
- %li= link_to 'About', '#'
+ - if user_signed_in?
+ %li= link_to "Sign out", destroy_user_session_path, :method => :delete
+ - else
+ %li= link_to "Register", new_user_registration_path
+ %li= link_to "Sign in", new_user_session_path
.container-fluid
.row
.span12
= yield
- = javascript_include_tag 'application'
+ = javascript_include_tag 'application'
+
View
7 app/views/pages/home.html.haml
@@ -2,10 +2,3 @@
%p
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque pulvinar, erat nec elementum pellentesque, dui nunc tristique nisi, et vestibulum nisl augue ac est. Curabitur venenatis mollis hendrerit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nulla pellentesque cursus purus eu hendrerit. Etiam vitae dui nibh, nec hendrerit est. Curabitur fermentum fringilla magna elementum auctor. Ut ullamcorper commodo urna, quis porttitor arcu rhoncus a. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum mattis blandit ante ut pretium. Ut lorem libero, volutpat ac semper eu, porttitor ut eros. Donec varius leo non purus convallis rutrum interdum in nunc. Ut vel dolor lectus, vitae sagittis nibh. Aenean luctus, neque ac placerat blandit, lacus orci rhoncus purus, quis commodo nulla nisi quis diam. Morbi interdum mi eu lorem feugiat rutrum. Pellentesque eu nibh sit amet ante varius sollicitudin in id lectus.
-
-%nav
- - if user_signed_in?
- = link_to "Sign out", destroy_user_session_path, :class => 'btn', :method => :delete
- - else
- = link_to "Register", new_user_registration_path, :class => 'btn btn-primary'
- = link_to "Sign in", new_user_session_path, :class => 'btn'

0 comments on commit 8d807ac

Please sign in to comment.