Permalink
Browse files

New_login_mobile_web_

  • Loading branch information...
movilla committed Sep 8, 2012
1 parent 5372e86 commit a564cbff9ded89947c76849d510bb476bf4e0d76
Showing with 25 additions and 11 deletions.
  1. +3 −2 app/assets/stylesheets/mobile.css.scss
  2. +21 −8 app/views/sessions/new.mobile.haml
  3. +1 −1 features/mobile.feature
@@ -110,8 +110,9 @@ body {
.login_error,
.login_alert {
- color: rgb(208, 49, 43);
- text-shadow: 1px 1px 20px rgb(208, 49, 43); }
+ color: #DF0101;
+ text-shadow: 1px 1px 5px #666;
+}
.login_notice {
color: rgb(10, 150, 10);
@@ -2,35 +2,48 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
+= stylesheet_link_tag :mobile
+
+:css
+ body{ padding: 10px; margin: 0px 10px;}
+ #flash_alert .message{ min-width: 200px; max-width: 400px;}
+ footer{ padding-top: 0;}
+ .landing{ padding: 20px; margin: -10px -20px 10px -20px; background-color:#4b4b4b; box-shadow: 0 3px 40px rgba(0,0,0,0.8); z-index: 10; position: relative; text-align: center;}
+ h1{ font-size: 40px; font-weight: 200;}
+
+.landing
+ %h1
+ = "#{pod_name}"
#main_stream.stream
- flash.each do |name, msg|
%p{:class => "login_#{name}"}= msg
+
#login_form
.login-container
- = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|
+ = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
%fieldset
%legend
- = t('devise.sessions.new.login')
+ = image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
+ = t('devise.sessions.new.login').upcase
.control-group
- = f.label :username, t('username'), :class => "control-label"
+ = f.label :username, t('username').upcase
.controls
- = f.text_field :username
+ = f.text_field :username, :autofocus => true
.control-group
- = f.label :password , t('password'), :class => "control-label"
+ = f.label :password , t('password').upcase
.controls
= f.password_field :password
= hidden_field(:user, :remember_me, :value => 1)
.controls
= f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
+ - if display_registration_link?
+ = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name), :class => 'btn primary', :style => "float: right;"
%footer
- - if display_registration_link?
- = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
-
- if display_password_reset_link?
= link_to t('devise.passwords.new.forgot_password'), new_password_path(resource_name)
View
@@ -7,5 +7,5 @@ Feature: Navigate mobile site
Scenario: Show mobile site
And I visit the mobile aspects page
- Then I should see "Log in"
+ Then I should see "LOG IN"

0 comments on commit a564cbf

Please sign in to comment.