Skip to content

Commit

Permalink
Merge pull request #42296 from nextcloud/backport/42268/stable28
Browse files Browse the repository at this point in the history
[stable28] fix(dashboard): changed h3 elements to h2
  • Loading branch information
AndyScherzinger authored Dec 15, 2023
2 parents 46f5ab8 + 558a3af commit 49bff0f
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 16 deletions.
17 changes: 10 additions & 7 deletions apps/dashboard/src/DashboardApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<NcModal v-if="modal" size="large" @close="closeModal">
<div class="modal__content">
<h3>{{ t('dashboard', 'Edit widgets') }}</h3>
<h2>{{ t('dashboard', 'Edit widgets') }}</h2>
<ol class="panels">
<li v-for="status in sortedAllStatuses" :key="status" :class="'panel-' + status">
<input :id="'status-checkbox-' + status"
Expand Down Expand Up @@ -101,7 +101,7 @@
<a v-if="isAdmin" :href="appStoreUrl" class="button">{{ t('dashboard', 'Get more widgets from the App Store') }}</a>

<div v-if="statuses.weather && isStatusActive('weather')">
<h3>{{ t('dashboard', 'Weather service') }}</h3>
<h2>{{ t('dashboard', 'Weather service') }}</h2>
<p>
{{ t('dashboard', 'For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information.') }}
</p>
Expand Down Expand Up @@ -485,6 +485,9 @@ export default {
}
.panel, .panels > div {
// Ensure the maxcontrast color is set for the background
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
width: 320px;
max-width: 100%;
margin: 16px;
Expand Down Expand Up @@ -591,6 +594,9 @@ export default {
.edit-panels,
.statuses ::v-deep .action-item .action-item__menutoggle,
.statuses ::v-deep .action-item.action-item--open .action-item__menutoggle {
// Ensure the maxcontrast color is set for the background
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
background-color: var(--color-main-background-blur);
-webkit-backdrop-filter: var(--filter-background-blur);
backdrop-filter: var(--filter-background-blur);
Expand Down Expand Up @@ -662,12 +668,9 @@ export default {
}
}
h3 {
h2 {
font-weight: bold;
&:not(:first-of-type) {
margin-top: 64px;
}
margin-top: 12px;
}
// Adjust design of 'Get more widgets' button
Expand Down
4 changes: 2 additions & 2 deletions dist/5211-5211.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/5211-5211.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/dashboard-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

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

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

0 comments on commit 49bff0f

Please sign in to comment.