Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up login form CSS #291

Merged
merged 3 commits into from
Aug 10, 2017
Merged

Clean up login form CSS #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1795dd
Refs #00000 - Cleans up the login form to use flexbox w/o hacky negat…
aaronransley Aug 6, 2017
81f84d7
Refs #00000 - Fix issue w/ forgot password screen
aaronransley Aug 6, 2017
7758187
Refs #00000 - Fixes max-width issue w/ inner labels on login-form
aaronransley Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/fae/globals/imports/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $fae-breakpoints: (
// @depreciation - remove page_header_save_block in v2.0
'page_header_save_block': ( max-width: 615px ),
'login_container': ( min-width: 700px ),
'login_submit': ( min-width: 475px ),
'login_submit': ( min-width: 500px ),
);

// Merge $custom-breakpoints, $fae-breakpoints, and Frob Core's $fine-breakpoints to one variable to use with bp() mixin
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/fae/modules/forms/_label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ label {
.label_inner {
flex-shrink: 0;
max-width: 50%;

.login-form & {
max-width: none;
}
}

h6 {
Expand Down
38 changes: 16 additions & 22 deletions app/assets/stylesheets/fae/pages/_login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,6 @@
width: 100%;
min-width: 100%;
}

input[type=submit] {
margin-top: 20px;

@include bp(login_submit) {
float: right;
margin: 0;
}
}
}

.login-logo {
Expand All @@ -76,31 +67,30 @@
width: 50%;
}
}
.login-form-actions {

.login-form-actions {
@include clearfix;

display: flex;
flex-wrap: wrap;
align-items: center;
padding-bottom: 20px;
padding-top: 20px;

@include bp(login_container) {
padding: 0;
}

.boolean {
margin: 12px 0 0 0;
@include bp(login_submit) {
padding-top: 0;
}

a {
display: inline-block;
padding-top: 15px;
font-size: 13px;
> * {
margin-bottom: 20px;
}
}

input {
&.login-form-actions-submit[type="submit"] {
@include bp(login_submit) {
margin-top: -27px;
}
> .input.boolean {
flex-grow: 1;
}
}

Expand Down Expand Up @@ -128,6 +118,10 @@ input {
margin-bottom: 15px;
}
}

input[type=submit] {
margin-right: 20px;
}
}

.first_user-form {
Expand Down