remove landing header on sign in mobile page
This commit is contained in:
parent
96af4a0aec
commit
119ded6fdc
4 changed files with 30 additions and 48 deletions
|
|
@ -651,24 +651,11 @@ input#user_password, #user_username, #user_password_confirmation, #user_email {
|
||||||
padding: 1px
|
padding: 1px
|
||||||
}
|
}
|
||||||
|
|
||||||
.session_mobile {
|
|
||||||
margin-top: -55px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1.session {
|
h1.session {
|
||||||
font-size: 40px;
|
font-size: 40px;
|
||||||
font-weight: 200;
|
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 {
|
form p.checkbox_select {
|
||||||
position: relative;
|
position: relative;
|
||||||
label {
|
label {
|
||||||
|
|
|
||||||
|
|
@ -2,42 +2,37 @@
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
.session_mobile
|
.stream#main_stream
|
||||||
.landing
|
- flash.each do |name, msg|
|
||||||
%h1.session
|
.expose#flash-container
|
||||||
= pod_name
|
.flash-message{class: "message alert alert-#{flash_class name}"}
|
||||||
|
= msg
|
||||||
|
|
||||||
#main_stream.stream
|
#login_form
|
||||||
- flash.each do |name, msg|
|
.login-container
|
||||||
.expose#flash-container
|
= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
|
||||||
.flash-message{class: "message alert alert-#{flash_class name}"}
|
%fieldset
|
||||||
= msg
|
%legend
|
||||||
|
= image_tag("branding/logos/header-logo2x.png", height: 40, width: 40)
|
||||||
|
= t("devise.sessions.new.login")
|
||||||
|
|
||||||
#login_form
|
.form-group
|
||||||
.login-container
|
= f.label :username, t("username")
|
||||||
= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
|
= f.text_field :username, autofocus: true, class: "form-control", autocapitalize: "none", autocorrect: "off"
|
||||||
%fieldset
|
|
||||||
%legend
|
|
||||||
= image_tag("branding/logos/header-logo2x.png", height: 40, width: 40)
|
|
||||||
= t("devise.sessions.new.login")
|
|
||||||
|
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :username, t("username")
|
= f.label :password, t("password")
|
||||||
= f.text_field :username, autofocus: true, class: "form-control", autocapitalize: "none", autocorrect: "off"
|
= f.password_field :password, class: "form-control"
|
||||||
|
= hidden_field(:user, :remember_me, value: 1)
|
||||||
|
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :password , t("password")
|
= f.submit t("devise.sessions.new.sign_in"), class: "btn btn-primary"
|
||||||
= f.password_field :password, class: "form-control"
|
- if display_registration_link?
|
||||||
= hidden_field(:user, :remember_me, value: 1)
|
= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name),
|
||||||
|
class: "btn btn-default pull-right"
|
||||||
|
|
||||||
.form-group
|
%footer
|
||||||
= f.submit t("devise.sessions.new.sign_in"), class: "btn btn-primary"
|
- if display_password_reset_link?
|
||||||
- if display_registration_link?
|
= link_to t("devise.passwords.new.forgot_password"), new_password_path(resource_name)
|
||||||
= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name),
|
|
||||||
class: "btn btn-default pull-right"
|
|
||||||
|
|
||||||
%footer
|
= link_to t("layouts.application.toggle"), toggle_mobile_path
|
||||||
- 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
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ Feature: editing the getting started in the mobile view
|
||||||
|
|
||||||
Background:
|
Background:
|
||||||
Given I am on the login page
|
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 fill in the new user form
|
||||||
And I submit the form
|
And I submit the form
|
||||||
Then I should be on the getting started page
|
Then I should be on the getting started page
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ Feature: New user registration
|
||||||
|
|
||||||
Background:
|
Background:
|
||||||
Given I am on the login page
|
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
|
Scenario: user signs up and goes to getting started
|
||||||
When I fill in the new user form
|
When I fill in the new user form
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue