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.

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

Login screen: Replace hardcoded CSS colors with Color Studio as per design guidelines #1612

Merged
merged 3 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 3 additions & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
### Enhancements

- Open new note automatically upon creation [1582](https://github.com/Automattic/simplenote-electron/pull/1582)
- Updated colors to use Color Studio, the color palette for Automattic products [#1565](https://github.com/Automattic/simplenote-electron/pull/1565)
- Updated colors to use Color Studio, the color palette for Automattic products
- [#1565](https://github.com/Automattic/simplenote-electron/pull/1565)
- [#1612](https://github.com/Automattic/simplenote-electron/pull/1612)

### Fixes

Expand Down
51 changes: 37 additions & 14 deletions lib/auth/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

.login__auth-message.is-error {
color: #be2a31;
color: $studio-red-60;
font-size: 16px;
margin: 0 auto 16px;
max-width: 347px;
Expand All @@ -37,8 +37,8 @@

input,
button[type='submit'] {
background-color: #ffffff;
border: solid 1px #e3e0e2;
background-color: $studio-white;
border: solid 1px $studio-gray-5;
border-radius: 4px;
box-sizing: border-box;
display: block;
Expand All @@ -52,21 +52,21 @@
}

button[type='submit'] {
background-color: #3584c8;
background-color: $studio-blue-50;
border: none;
color: #ffffff;
color: $studio-white;
font-weight: 500;
margin: 16px auto 8px;
padding: 0px 15px 2px;
}

a.login__forgot {
color: #135d95;
color: $studio-gray-60;
text-decoration: none;
}

.login__forgot, .login__signup, .terms {
color: #51565f;
color: $studio-gray-60;
display: block;
font-size: 14px;
margin: 16px auto;
Expand All @@ -75,14 +75,14 @@
}

.login__signup a, .terms a {
color: #135d95;
color: $studio-blue-60;
margin-left: 5px;
text-decoration: none;
}

.or {
background: #ffffff;
color: #6f7780;
background: $studio-white;
color: $studio-gray-60;
display: block;
font-size: 15px;
font-style: italic;
Expand All @@ -95,7 +95,7 @@
}

.or-line {
border-bottom: 1px solid #dbdee0;
border-bottom: 1px solid $studio-gray-5;
margin: -20px auto;
max-width: 320px;
text-align: center;
Expand All @@ -105,10 +105,10 @@
}

.wpcc-button {
background-color: #006088;
background-color: $studio-blue-50;
border-radius: 4px;
box-sizing: border-box;
color: #ffffff;
color: $studio-white;
display: block;
font-size: 16px;
font-weight: 500;
Expand All @@ -123,7 +123,30 @@
}

.theme-dark .login {
h1 {
color: $studio-white;
}
a.login__forgot {
color: $studio-gray-20;
}

.login__forgot, .login__signup, .terms {
color: $studio-gray-20;
}

.login__signup a, .terms a {
color: $studio-blue-20;
}

.login__auth-message.is-error {
color: $studio-red-20;
}

.or {
background: #1e1e1e;
background: $studio-gray-90;
color: $studio-gray-20;
}
.or-line {
border-color: $studio-gray-80;
}
}