Skip to content

[stable28] fix/41826 avoid same h1 and h2 headings #42848

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
ShGKme merged 1 commit into from
Jan 16, 2024
Merged

[stable28] fix/41826 avoid same h1 and h2 headings #42848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Complete <h1> settings heading 
Signed-off-by: julia.kirschenheuter <[email protected]>

(cherry picked from commit f6ec297)
Signed-off-by: julia.kirschenheuter <[email protected]>
  • Loading branch information
@JuliaKirschenheuter
JuliaKirschenheuter committed Jan 16, 2024
commit acc78272a548ed282e7fad1861931d18d27134b6
2 changes: 1 addition & 1 deletion apps/theming/src/UserThemes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<template>
<section>
<NcSettingsSection :name="t('theming', 'Appearance and accessibility')"
<NcSettingsSection :name="t('theming', 'Appearance and accessibility settings')"
:limit-width="false"
class="theming">
<!-- eslint-disable-next-line vue/no-v-html -->
Expand Down
5 changes: 4 additions & 1 deletion core/templates/layout.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@

<main id="content" class="app-<?php p($_['appid']) ?>">
<h1 class="hidden-visually" id="page-heading-level-1">
<?php p(!empty($_['pageTitle'])?$_['pageTitle']:$theme->getName()); ?>
<?php p((!empty($_['application']) && !empty($_['pageTitle']) && $_['application'] != $_['pageTitle'])
? $_['application'].': '.$_['pageTitle']
: (!empty($_['pageTitle']) ? $_['pageTitle'] : $theme->getName())
); ?>
</h1>
<?php print_unescaped($_['content']); ?>
</main>
Expand Down
4 changes: 2 additions & 2 deletions dist/theming-personal-theming.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/theming-personal-theming.js.map
View file
Open in desktop

Large diffs are not rendered by default.