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

Jump to bottom

improve login/signup styles #476

Merged
merged 1 commit into from
Dec 8, 2020
Merged

improve login/signup styles #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions app/auth/login/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<div class="Sections Sections--center">
<section class="Section">
<header class="Manchet">
<h1>
Log in <small>to Radio4000</small>
</h1>
<p class="u-tc">
No account? <a href="{{href-to 'auth.signup'}}">Sign up</a> &rarr;
</p>
</header>
<div class="Container Container--small">
{{user-login onLogin=(action "submitLogin")}}
</div>
<section class="Section Section--flex Section--flexCenter">
<article class="Aside Aside--login">
<header class="Manchet">
<h1>
Log in <small>to Radio4000</small>
</h1>
</header>
<div>
{{user-login onLogin=(action "submitLogin")}}
</div>
</article>
</section>
<section>
<p class="u-tc">
No account? &rarr; <a class="Btn Btn--primary" href="{{href-to 'auth.signup'}}">Sign up</a> !
</p>
</section>
</div>
16 changes: 9 additions & 7 deletions app/auth/signup/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<div class="Sections Sections--center">
<section class="Section Section--flex Section--flexCenter">
<div class="Manchet">
<h1><small>Create a</small> Radio4000 account</h1>
<p class="u-tc">&larr; looking to {{link-to "login" "auth.login" }}?</p>
</div>
<div class="Container">
{{user-signup onSignup=(action "signup")}}
</div>
<article class="Aside Aside--signup">
<div class="Manchet">
<h1><small>Create a</small> Radio4000 account</h1>
<p class="u-tc">&larr; looking to {{link-to "login" "auth.login" }}?</p>
</div>
<div>
{{user-signup onSignup=(action "signup")}}
</div>
</article>
</section>

<section class="Section">
Expand Down
8 changes: 5 additions & 3 deletions app/components/user-signup/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
{{input type="password" value=v placeholder="Use a (new) and strong password " required="required"}}
{{/form-group}}

{{user-agreements onAgreed=(action 'signUserAgreement')}}
{{user-agreements
onAgreed=(action 'signUserAgreement')
class="Form-group"}}

{{#btn-group class="Form-group BtnGroup BtnGroup--right"}}
<button
disabled={{cannotEmailSignUp}}
type="submit"
class="Btn Btn--large"
title="Add track to your radio">
class="Btn Btn--large Btn--primary"
title="Register a radio4000.com account">
{{if submitTask.isIdle "Sign Up" "Signing Up…"}}
</button>
{{/btn-group}}
Expand Down
17 changes: 17 additions & 0 deletions app/styles/components/_aside.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
.Aside--login,
.Aside--signup {
padding: 1.5rem 1rem;
margin: 1rem;
@media (min-width: $layout-m) {
padding: 2rem;
}
}

.Aside--login {
background-color: $mediumlightgray;
}

.Aside--signup {
background-color: $bleach;
}

.Aside--navigation {
display: none;
position: fixed;
Expand Down