Skip to content

Commit

Permalink
Create <h3> headings for profile page. Replace <label> which have…
Browse files Browse the repository at this point in the history
… no conncted `<input>` with `<h3>` heading

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
  • Loading branch information
JuliaKirschenheuter committed Mar 24, 2023
1 parent 97b8e6d commit 85feae6
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion apps/settings/css/settings.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions apps/settings/css/settings.scss
Expand Up @@ -55,8 +55,7 @@ input {
.personal-settings-setting-box {
.section {
padding: 10px 30px;

h3 {
.headerbar-label {
margin-bottom: 0;
}

Expand Down
4 changes: 2 additions & 2 deletions apps/settings/js/federationsettingsview.js
Expand Up @@ -82,7 +82,7 @@
];

_.each(this._inputFields, function(field) {
var $icon = self.$('#' + field + 'form h3 > .federation-menu');
var $icon = self.$('#' + field + 'form .headerbar-label > .federation-menu');
var excludedScopes = []

if (fieldsWithV2Private.indexOf(field) === -1) {
Expand Down Expand Up @@ -245,7 +245,7 @@
},

_setFieldScopeIcon: function(field, scope) {
var $icon = this.$('#' + field + 'form > h3 .icon-federation-menu');
var $icon = this.$('#' + field + 'form > .headerbar-label .icon-federation-menu');

$icon.removeClass('icon-phone');
$icon.removeClass('icon-password');
Expand Down
Expand Up @@ -22,6 +22,7 @@

<template>
<section id="vue-avatar-section">
<h3 class="hidden-visually"> {{ t('settings', 'Your profile information') }} </h3>
<HeaderBar :input-id="avatarChangeSupported ? inputId : null"
:readable="avatar.readable"
:scope.sync="avatar.scope" />
Expand Down
Expand Up @@ -22,7 +22,7 @@

<template>
<section>
<HeaderBar :readable="t('settings', 'Details')" />
<HeaderBar :is-heading="true" :readable="t('settings', 'Details')" />

<div class="details">
<div class="details__groups">
Expand Down
Expand Up @@ -24,7 +24,7 @@
<!-- TODO remove this inline margin placeholder once the settings layout is updated -->
<section id="profile-visibility"
:style="{ marginLeft }">
<HeaderBar :readable="heading" />
<HeaderBar :is-heading="true" :readable="heading" />

<em :class="{ disabled }">
{{ t('settings', 'The more restrictive setting of either visibility or scope is respected on your Profile. For example, if visibility is set to "Show to everyone" and scope is set to "Private", "Private" is respected.') }}
Expand Down
17 changes: 13 additions & 4 deletions apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
Expand Up @@ -21,8 +21,12 @@
-->

<template>
<h3 :class="{ 'setting-property': isSettingProperty, 'profile-property': isProfileProperty }">
<label :for="inputId">
<component :is="isHeading ? `h3` : `div`" class="headerbar-label" :class="{ 'setting-property': isSettingProperty, 'profile-property': isProfileProperty }">
<span v-if="isHeading">
<!-- Already translated as required by prop validator -->
{{ readable }}
</span>
<label v-else :for="inputId">
<!-- Already translated as required by prop validator -->
{{ readable }}
</label>
Expand All @@ -45,7 +49,7 @@
{{ t('settings', 'Add') }}
</NcButton>
</template>
</h3>
</component>
</template>

<script>
Expand Down Expand Up @@ -93,6 +97,10 @@ export default {
type: Boolean,
default: true,
},
isHeading: {
type: Boolean,
default: false,
}
},
data() {
Expand Down Expand Up @@ -124,7 +132,8 @@ export default {
</script>

<style lang="scss" scoped>
h3 {
.headerbar-label {
font-weight: normal;
display: inline-flex;
width: 100%;
margin: 12px 0 0 0;
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-info.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-info.js.map

Large diffs are not rendered by default.

0 comments on commit 85feae6

Please sign in to comment.