Skip to content

Use new vue components in login form #33781

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

Merged
CarlSchwan merged 2 commits into from
Sep 6, 2022
Merged

Use new vue components in login form #33781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df40fc9
Use new vue components in login form
CarlSchwan Aug 31, 2022
43d1aa3
More cleaning up of the login component
CarlSchwan Sep 1, 2022
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
81 changes: 5 additions & 76 deletions core/css/guest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,6 @@ form {
margin: auto;
padding: 0;
}
form fieldset {
width: 260px;
margin-top: 8px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
form #sqliteInformation {
margin-top: 0px;
margin-bottom: 20px;
Expand Down Expand Up @@ -146,8 +138,7 @@ form #datadirField legend {
}

/* Buttons and input */
#submit-wrapper,
#reset-password-wrapper {
#submit-wrapper {
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -160,14 +151,10 @@ form #datadirField legend {
.wrapper {
margin-top: 0;
}
.alternative-logins {
margin: auto;
}
}


#submit-wrapper .submit-icon,
#reset-password-wrapper .submit-icon {
#submit-wrapper .submit-icon {
position: absolute;
right: 24px;
transition: right 100ms ease-in-out;
Expand All @@ -187,12 +174,6 @@ form #datadirField legend {
right: 20px;
}

#reset-password-submit {
padding: 10px;
overflow: hidden;
text-overflow: ellipsis;
}

#submit-wrapper .icon-loading-small {
position: absolute;
top: 22px;
Expand Down Expand Up @@ -262,9 +243,6 @@ input[type='email'] {
color: var(--color-text-lighter);
cursor: text;
font-family: inherit;
-webkit-appearance: textfield;
-moz-appearance: textfield;
box-sizing: content-box;
font-weight: normal;
margin-left: 0;
margin-right: 0;
Expand Down Expand Up @@ -471,53 +449,6 @@ form .warning input[type='checkbox']+label {
#remember_login {
margin: 18px 5px 0 16px !important;
}
.lost-password-container {
display: inline-block;
margin: 10px 0;
text-align: center;
width: 100%;
}
#lost-password,
#lost-password-back,
#reset-password-wrapper + a {
display: inline-block;
font-weight: normal !important;
padding: 12px 12px 0 12px;
cursor: pointer;
}
#forgot-password {
padding: 11px;
float: right;
color: var(--color-primary-text);
}

/* Alternative Logins */
.alternative-logins legend {
margin-bottom: 10px;
}
.alternative-logins li {
height: 40px;
white-space: nowrap;
padding: 05px;
}
.alternative-logins a.button,
.alternative-logins li a {
width: 100%;
display: inline-block;
text-align: center;
box-sizing: border-box;
border: 2px solid var(--color-primary-text);
background-color: var(--color-primary);
color: var(--color-primary-text);
border-radius: 100px; /* --border-radius-pill */
}

.alternative-logins a.button:focus,
.alternative-logins li a:focus {
border: 2px solid var(--color-primary-hover);
background-image: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-light) 100%);
background-position: initial;
}

/* fixes for update page TODO should be fixed some time in a proper way */
/* this is just for an error while updating the ownCloud instance */
Expand Down Expand Up @@ -792,24 +723,22 @@ a.legal {
}

.notecard.success {
--note-background: rgba(var(--color-success-rgb), 0.2);
--note-background: rgba(var(--color-success-rgb), 0.1);
--note-theme: var(--color-success);
}
.notecard.error {
--note-background: rgba(var(--color-error-rgb), 0.2);
--note-background: rgba(var(--color-error-rgb), 0.1);
--note-theme: var(--color-error);
}
.notecard.warning {
--note-background: rgba(var(--color-warning-rgb), 0.2);
--note-background: rgba(var(--color-warning-rgb), 0.1);
--note-theme: var(--color-warning);
}
.notecard {
color: var(--color-text-light);
background-color: var(--note-background);
border: 1px solid var(--color-border);
border-left: 4px solid var(--note-theme);
border-radius: var(--border-radius);
box-shadow: rgba(43, 42, 51, 0.05) 0px 1px 2px 0px;
margin: 1rem 0;
margin-top: 1rem;
padding: 1rem;
Expand Down
7 changes: 0 additions & 7 deletions core/css/lostpassword/resetpassword.css
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions core/src/components/login/LoginButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,9 @@ export default {
},
}
</script>

<style lang="scss" scoped>
.button-vue {
margin-top: .5rem;
}
</style>
Loading