summaryrefslogtreecommitdiffstats
path: root/apps/settings/src
diff options
context:
space:
mode:
authorCarl Schwan <carl@carlschwan.eu>2022-08-25 14:25:56 +0200
committerJohn Molakvoæ <skjnldsv@protonmail.com>2022-08-26 19:51:10 +0200
commitf1ce2c2b9303426266a81cacb8efb4ebdb6d2458 (patch)
tree51863c552a0ab5576606fcae2fc823bb74440e3d /apps/settings/src
parent1d35a53991f356976d78b8053651737821502687 (diff)
downloadnextcloud-server-f1ce2c2b9303426266a81cacb8efb4ebdb6d2458.tar.gz
nextcloud-server-f1ce2c2b9303426266a81cacb8efb4ebdb6d2458.zip
Fix rebasing issues and improve profile settings page a bit more
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'apps/settings/src')
-rw-r--r--apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue24
-rw-r--r--apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue8
2 files changed, 5 insertions, 27 deletions
diff --git a/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue b/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue
index 351af504682..d855832746a 100644
--- a/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue
@@ -205,35 +205,11 @@ section {
resize: vertical;
grid-area: 1 / 1;
width: 100%;
- margin: 3px 3px 3px 0;
- padding: 7px 6px;
- color: var(--color-main-text);
- border: 1px solid var(--color-border-dark);
- border-radius: var(--border-radius);
- background-color: var(--color-main-background);
- font-family: var(--font-face);
- cursor: text;
-
- &:hover,
- &:focus,
- &:active {
- border-color: var(--color-primary-element) !important;
- outline: none !important;
- }
}
input {
grid-area: 1 / 1;
width: 100%;
- height: 34px;
- margin: 3px 3px 3px 0;
- padding: 7px 6px;
- color: var(--color-main-text);
- border: 1px solid var(--color-border-dark);
- border-radius: var(--border-radius);
- background-color: var(--color-main-background);
- font-family: var(--font-face);
- cursor: text;
}
.property__actions-container {
diff --git a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
index bd6cc437928..a72e07b4774 100644
--- a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
@@ -130,6 +130,8 @@ export default {
display: inline-flex;
width: 100%;
margin: 12px 0 0 0;
+ gap: 8px;
+ align-items: center;
font-size: 16px;
color: var(--color-text-light);
@@ -138,7 +140,7 @@ export default {
}
&.setting-property {
- height: 32px;
+ height: 44px;
}
label {
@@ -147,10 +149,10 @@ export default {
}
.federation-control {
- margin: -12px 0 0 8px;
+ margin: 0;
}
.button-vue {
- margin: -6px 0 0 auto !important;
+ margin: 0 0 0 auto !important;
}
</style>