Skip to content

Improve personal settings layout #41718

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

Draft
marcoambrosini wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Improve personal settings layout #41718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f80b06a
Improve personal settings layout
marcoambrosini Mar 11, 2024
4239bd5
Merge branch 'master' into enh/noid/fix-personal-settings-layout
marcoambrosini Mar 11, 2024
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
Next Next commit
Improve personal settings layout 
Signed-off-by: Marco <[email protected]>
  • Loading branch information
@marcoambrosini
marcoambrosini committed Mar 11, 2024
commit f80b06a265de37ff92161ad50484971bceb5ab07
15 changes: 11 additions & 4 deletions apps/settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,17 @@ select {
}

#personal-settings {
display: grid;
display: flex;
padding: 20px;
max-width: 1700px;
grid-template-columns: repeat(auto-fill, minmax(min(100%, 300px), 1fr));
grid-column-gap: 10px;
max-width: 1600px;
margin: auto;
flex-wrap: wrap-reverse;
justify-content: center;
gap: 16px;

label {
font-weight: bold;
}

.section {
padding: 10px 10px;
Expand All @@ -101,6 +107,7 @@ select {
}

h3 {
font-weight: bold;
> label {
font-weight: bold;
}
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/components/PersonalInfo/ProfileSection/EditProfileAnchorLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,10 @@ html {
a {
display: block;
height: 44px;
width: min(100%, 290px);
overflow: hidden;
text-overflow: ellipsis;
line-height: 44px;
padding: 0 16px;
margin: 14px auto;
border-radius: var(--border-radius-pill);
color: var(--color-text-maxcontrast);
background-color: transparent;
Expand Down
1 change: 0 additions & 1 deletion apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export default {
display: flex;
flex-direction: column;
position: relative;
width: min(100%, 290px);
height: 116px;
margin: 14px auto;
border-radius: var(--border-radius-large);
Expand Down
12 changes: 9 additions & 3 deletions apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@
<section>
<HeaderBar :is-heading="true" :readable="propertyReadable" />

<ProfileCheckbox :profile-enabled.sync="profileEnabled" />
<div class="profile-section_controls-wrapper">
<ProfileCheckbox :profile-enabled.sync="profileEnabled" />
<EditProfileAnchorLink :profile-enabled="profileEnabled" />
</div>

<ProfilePreviewCard :organisation="organisation"
:display-name="displayName"
:profile-enabled="profileEnabled"
:user-id="userId" />

<EditProfileAnchorLink :profile-enabled="profileEnabled" />
</section>
</template>

Expand Down Expand Up @@ -103,4 +104,9 @@ section {
cursor: default;
}
}

.profile-section_controls-wrapper {
display: flex;
align-items: center;
}
</style>
11 changes: 3 additions & 8 deletions ...ettings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
-->

<template>
<!-- TODO remove this inline margin placeholder once the settings layout is updated -->
<section id="profile-visibility"
:style="{ marginLeft }">
<section id="profile-visibility">
<HeaderBar :is-heading="true" :readable="heading" />

<em :class="{ disabled }">
Expand Down Expand Up @@ -79,10 +77,6 @@ export default {
visibilityParams: Object.entries(profileConfig)
.map(([paramId, { appId, displayId, visibility }]) => ({ id: paramId, appId, displayId, visibility }))
.sort(compareParams),
// TODO remove this when not used once the settings layout is updated
marginLeft: window.matchMedia('(min-width: 1600px)').matches
? window.getComputedStyle(document.getElementById('vue-avatar-section')).getPropertyValue('width').trim()
: '0px',
}
},

Expand Down Expand Up @@ -121,8 +115,9 @@ export default {
<style lang="scss" scoped>
section {
padding: 30px;
max-width: 900px;
max-width: 800px;
width: 100%;
margin: auto;

em {
display: block;
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export default {

<style lang="scss" scoped>
.headerbar-label {
font-weight: normal;
font-weight: bold;
display: inline-flex;
width: 100%;
margin: 12px 0 0 0;
Expand Down
101 changes: 53 additions & 48 deletions apps/settings/templates/settings/personal/personal.info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,64 +44,69 @@
<?php endif; ?>

<div id="personal-settings">
<h2 class="hidden-visually"><?php p($l->t('Personal info')); ?></h2>
<div id="vue-avatar-section"></div>
<?php if ($_['profileEnabledGlobally']) : ?>
<div class="personal-settings-setting-box personal-settings-setting-box-profile">
<div id="vue-profile-section"></div>
</div>
<div class="personal-settings-setting-box personal-settings-setting-box-detail">
<div id="vue-details-section"></div>
<div class-"personal-settings__left-column">
<div class="personal-settings-setting-box"></div>
<div id="vue-displayname-section"></div>

<div class="personal-settings-setting-box">
<div id="vue-email-section"></div>
</div>
<?php else: ?>
<div class="personal-settings-setting-box personal-settings-setting-box-detail--without-profile">
<div id="vue-details-section"></div>
<div class="personal-settings-setting-box">
<div id="vue-phone-section"></div>
</div>
<?php endif; ?>
<div class="personal-settings-setting-box">
<div id="vue-displayname-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-email-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-phone-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-location-section"></div>
</div>
<div class="personal-settings-setting-box personal-settings-language-box">
<div id="vue-language-section"></div>
</div>
<div class="personal-settings-setting-box personal-settings-locale-box">
<div id="vue-locale-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-website-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-twitter-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-fediverse-section"></div>
</div>
<?php if ($_['profileEnabledGlobally']) : ?>
<div class="personal-settings-setting-box">
<div id="vue-organisation-section"></div>
<div id="vue-location-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-role-section"></div>
<div id="vue-website-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-headline-section"></div>
<div id="vue-twitter-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-biography-section"></div>
<div id="vue-fediverse-section"></div>
</div>
<?php endif; ?>
<span class="msg"></span>

<div id="personal-settings-group-container"></div>
<?php if ($_['profileEnabledGlobally']) : ?>
<div class="personal-settings-setting-box">
<div id="vue-organisation-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-role-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-headline-section"></div>
</div>
<div class="personal-settings-setting-box">
<div id="vue-biography-section"></div>
</div>
<?php endif; ?>
<span class="msg"></span>
<div id="personal-settings-group-container"></div>
</div>
<div class="personal-settings__right-column">
<h2 class="hidden-visually"><?php p($l->t('Personal info')); ?></h2>
<div id="vue-avatar-section"></div>
<?php if ($_['profileEnabledGlobally']) : ?>
<div class="personal-settings-setting-box personal-settings-setting-box-profile">
<div id="vue-profile-section"></div>
</div>
<div class="personal-settings-setting-box personal-settings-setting-box-detail">
<div id="vue-details-section"></div>
</div>
<?php else: ?>
<div class="personal-settings-setting-box personal-settings-setting-box-detail--without-profile">
<div id="vue-details-section"></div>
</div>
<?php endif; ?>
<div class="personal-settings-setting-box personal-settings-language-box">
<div id="vue-language-section"></div>
</div>
<div class="personal-settings-setting-box personal-settings-locale-box">
<div id="vue-locale-section"></div>
</div>
</div>


</div>
<?php if ($_['profileEnabledGlobally']) : ?>
<div class="personal-settings-section">
Expand Down