nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove landing header on sign in mobile page

Browse source
This commit is contained in:
fla 2015-10-24 15:07:52 +02:00
parent 96af4a0aec
commit 119ded6fdc
4 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/mobile/mobile.scss
View file

@ -651,24 +651,11 @@ input#user_password, #user_username, #user_password_confirmation, #user_email {
padding: 1px
}
.session_mobile {
margin-top: -55px;
}
h1.session {
font-size: 40px;
font-weight: 200;
}
.landing {
padding: 20px;
margin: -10px -20px 10px -20px;
background-color:#4b4b4b;
z-index: 10;
position: relative;
text-align: center;
}
form p.checkbox_select {
position: relative;
label {

61
app/views/sessions/new.mobile.haml
View file

@ -2,42 +2,37 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
.session_mobile
.landing
%h1.session
= pod_name
.stream#main_stream
- flash.each do |name, msg|
.expose#flash-container
.flash-message{class: "message alert alert-#{flash_class name}"}
= msg
#main_stream.stream
- flash.each do |name, msg|
.expose#flash-container
.flash-message{class: "message alert alert-#{flash_class name}"}
= msg
#login_form
.login-container
= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
%fieldset
%legend
= image_tag("branding/logos/header-logo2x.png", height: 40, width: 40)
= t("devise.sessions.new.login")
#login_form
.login-container
= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
%fieldset
%legend
= image_tag("branding/logos/header-logo2x.png", height: 40, width: 40)
= t("devise.sessions.new.login")
.form-group
= f.label :username, t("username")
= f.text_field :username, autofocus: true, class: "form-control", autocapitalize: "none", autocorrect: "off"
.form-group
= f.label :username, t("username")
= f.text_field :username, autofocus: true, class: "form-control", autocapitalize: "none", autocorrect: "off"
.form-group
= f.label :password, t("password")
= f.password_field :password, class: "form-control"
= hidden_field(:user, :remember_me, value: 1)
.form-group
= f.label :password , t("password")
= f.password_field :password, class: "form-control"
= hidden_field(:user, :remember_me, value: 1)
.form-group
= f.submit t("devise.sessions.new.sign_in"), class: "btn btn-primary"
- if display_registration_link?
= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name),
class: "btn btn-default pull-right"
.form-group
= f.submit t("devise.sessions.new.sign_in"), class: "btn btn-primary"
- if display_registration_link?
= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name),
class: "btn btn-default pull-right"
%footer
- if display_password_reset_link?
= link_to t("devise.passwords.new.forgot_password"), new_password_path(resource_name)
%footer
- if display_password_reset_link?
= link_to t("devise.passwords.new.forgot_password"), new_password_path(resource_name)
= link_to t("layouts.application.toggle"), toggle_mobile_path
= link_to t("layouts.application.toggle"), toggle_mobile_path

2
features/mobile/getting_started.feature
View file

@ -3,7 +3,7 @@ Feature: editing the getting started in the mobile view
Background:
Given I am on the login page
When I follow "Sign up"
When I follow "Sign up" within ".navbar"
And I fill in the new user form
And I submit the form
Then I should be on the getting started page

2
features/mobile/signs_up.feature
View file

@ -6,7 +6,7 @@ Feature: New user registration
Background:
Given I am on the login page
And I follow "Sign up"
And I follow "Sign up" within "#login_form"
Scenario: user signs up and goes to getting started
When I fill in the new user form