diff --git a/app/assets/images/velo_logo.png b/app/assets/images/velo_logo.png new file mode 100644 index 0000000..fa7922f Binary files /dev/null and b/app/assets/images/velo_logo.png differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 221a607..dc440fe 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,8 +11,31 @@ *= require_self *= require datepicker *= require bootstrap - *= require bootstrap-responsive *= require bootstrap-timepicker *= require bootstrap_and_overrides - *= require bootstrap-fontawesome */ + +.container { + max-width: 940px; + margin: 0 auto; +} + +.container img { + display: block; + margin: 0 auto; +} + +p { + text-align: center; + padding: 20px 0; +} + +.check_box { + width: 30px; + height: 30px; + background-color: white; +} + +label { + font-size: x-large; +} \ No newline at end of file diff --git a/app/views/devise/_links.erb b/app/views/devise/_links.erb index fc68770..cb9ec54 100644 --- a/app/views/devise/_links.erb +++ b/app/views/devise/_links.erb @@ -6,13 +6,13 @@ <%- if devise_mapping.registerable? && controller_name != 'registrations' %>

- <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block btn-default" %>
+ <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block btn-default btn-lg" %>

<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>

- <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block btn-default" %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block btn-default btn-lg" %>

<% end -%> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 141a25c..e62554a 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,48 +1,52 @@ -<%= stylesheet_link_tag "bootstrap_and_overrides", :media => "all" %> +<%= stylesheet_link_tag "bootstrap", :media => "all" %> +<%= stylesheet_link_tag "application", :media => "all" %> +
+ <%= image_tag 'velo_logo.png' %> +

Made with ♥ in Baltimore

+
+
+ <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> +
+
+
+ <%= f.text_field :username, placeholder: "Username", class: "form-control input-lg", autofocus: true %> +
-

Velocipede

-Made with ♥ in Baltimore -
-
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -
- <%= f.text_field :username, placeholder: "Username", class: "form-control input-lg"%> -
+
+ <%= f.password_field :password, placeholder: "Password", class: "form-control input-lg" %> +
-
- <%= f.password_field :password, placeholder: "Password", class: "form-control input-lg" %> -
+
+ <% if devise_mapping.rememberable? -%> + + <% end -%> +
+
+
+
+
+
+

+ <%= f.submit "Sign in", class:"btn btn-lg btn-primary col-xs-12 col-sm-12 col-md-12" %> +

+
+
+
+ <% end %> -
- <% if devise_mapping.rememberable? -%> - - <% end -%> -
+ <%= render "links" %> -
+ <% if Rails.env.development? %>

- <%= f.submit "Sign in", class:"btn btn-lg btn-primary" %> -

-

Or quickly...

-
- - -
-
-<% end %> - -<%= render "links" %> - -<% if Rails.env.development? %> -

- <% User.all.each do |user| %> - <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> - <%= f.hidden_field :username, :value => user.username%> - <%= f.hidden_field :password, :value => 'password' %> - <%= f.submit "Sign in as #{user.username}", class:"btn btn-info" %> + <% User.all.each do |user| %> + <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> + <%= f.hidden_field :username, :value => user.username%> + <%= f.hidden_field :password, :value => 'password' %> + <%= f.submit "Sign in as #{user.username}", class:"btn btn-info" %> + <% end %> <% end %> +

<% end %> -

-<% end %> +
\ No newline at end of file