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

Improve login screen design #4500

Merged
merged 4 commits into from
Sep 2, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 6 additions & 0 deletions changelog/unreleased/enhancement-login-screen-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Improve login screen design

We've improved the design of the login screen to match with the general design used in Web.

https://github.com/owncloud/ocis/pull/4500
https://github.com/owncloud/web/issues/7552
Binary file added services/idp/.DS_Store
Binary file not shown.
35 changes: 18 additions & 17 deletions services/idp/src/app.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
/* additional css on top of kpop */
@font-face {
font-family: Inter;
src: url(./fonts/inter.ttf) format('truetype');
font-weight: 100 900;
font-style: oblique 0deg 12deg;
}

html {
font-feature-settings: "cv11";
}

body {
font-family: 'Open Sans', sans-serif;
font-family: Inter, 'Open Sans', sans-serif;
kulmann marked this conversation as resolved.
Show resolved Hide resolved
}

strong {
Expand Down Expand Up @@ -42,10 +53,9 @@ strong {
}

.oc-input {
background-color: #042047;
border: 1px solid rgba(78, 133, 200, 0.8);
background-color: #fff;
border: 1px solid #fff;
border-radius: 3px;
color: rgba(255, 255, 255, 0.8);
height: 40px;
width: 300px;
padding: 16px;
Expand Down Expand Up @@ -73,10 +83,6 @@ strong {
border: 1px solid #fff;
}

.oc-input::placeholder {
color: rgba(78, 133, 200, 0.8);
}

.oc-input + .oc-input {
margin-top: 15px;
}
Expand All @@ -92,17 +98,12 @@ strong {

.oc-button-primary {
/* Needs to be important to overwrite material-ui */
background-color: #4a76ac !important;
width: 100%;
background: linear-gradient(to right, #2c588e, #4e85c8) -1px;
background-size: 103% !important;
border: 1px solid transparent !important;
}

.oc-button-primary:hover,
.oc-button-primary:focus {
/* Needs to be important to overwrite material-ui */
background-color: #4a76ac !important;
border: 1px solid white !important;
}

.oc-checkbox-dark svg {
/* Needs to be important to overwrite material-ui */
fill: white !important;
Expand All @@ -123,7 +124,7 @@ strong {

/* Helpers */
.oc-mt-l {
margin-top: 30px !important;
margin-top: 24px !important;
}

.oc-mb-m {
Expand Down
1 change: 0 additions & 1 deletion services/idp/src/containers/Login/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ function Login(props) {
{hasError && <Typography id="oc-login-error-message" variant="subtitle2" component="span" color="error" className={classes.message}>{errorMessage}</Typography>}
<div className={classes.wrapper}>
{loginFailed && passwordResetLink && <Link id="oc-login-password-reset" href={passwordResetLink} variant="subtitle2">{"Reset password?"}</Link>}
<br />
<Button
type="submit"
color="primary"
Expand Down
Binary file added services/idp/src/fonts/inter.ttf
Binary file not shown.