Skip to content

A platform for community discussion. Free, open, simple.

UX: fix DE label + manage btn changes (#41696)

chapoi9c00d07ef97b
diff --git a/app/assets/stylesheets/admin/admin_dashboard.scss b/app/assets/stylesheets/admin/admin_dashboard.scss
index 24b1a8428e5..46e4601ff6c 100644
--- a/app/assets/stylesheets/admin/admin_dashboard.scss
+++ b/app/assets/stylesheets/admin/admin_dashboard.scss
@@ -235,6 +235,7 @@ $db-bar-height: var(--space-2);
&__header-row {
display: flex;
+ justify-content: space-between;
align-items: center;
}
diff --git a/app/assets/stylesheets/admin/dashboard/reports.scss b/app/assets/stylesheets/admin/dashboard/reports.scss
index d5126f93123..2ec51ca2761 100644
--- a/app/assets/stylesheets/admin/dashboard/reports.scss
+++ b/app/assets/stylesheets/admin/dashboard/reports.scss
@@ -44,8 +44,8 @@
}
&__label {
- color: var(--primary-high);
- background: var(--primary-low);
+ background: var(--tertiary-low);
+ color: var(--tertiary);
border-radius: 4px;
font-size: var(--font-down-3);
padding: var(--space-half) var(--space-2);
@@ -58,11 +58,6 @@
right: var(--space-3);
transform: translateY(-40%);
}
-
- &.--data_explorer_query {
- background: var(--tertiary-low);
- color: var(--tertiary);
- }
}
&__remove {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8b2ef594629..c98682c4e96 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7297,6 +7297,7 @@ en:
poor_match: "Poor match"
poor_match_tooltip: "Search terms with a click-through rate (CTR) between 1-20%."
reports_section:
+ header_action: "Manage"
description: "Pin standard reports or Data Explorer queries to track what matters to your community."
add: "Add report"
remove: "Remove report"
diff --git a/frontend/discourse/admin/components/dashboard/reports.gjs b/frontend/discourse/admin/components/dashboard/reports.gjs
index 87e5f266107..9d4d339fc78 100644
--- a/frontend/discourse/admin/components/dashboard/reports.gjs
+++ b/frontend/discourse/admin/components/dashboard/reports.gjs
@@ -127,6 +127,7 @@ export default class DashboardReports extends Component {
@bordered={{false}}
@layout="grid"
@headerActionIcon={{if this.canEdit "gear"}}
+ @headerActionLabel="admin.dashboard.reports_section.header_action"
@headerAction={{if this.canEdit this.openReportsConfig}}
@startDate={{@startDate}}
@endDate={{@endDate}}
diff --git a/frontend/discourse/admin/components/dashboard/section.gjs b/frontend/discourse/admin/components/dashboard/section.gjs
index ba2a4f607a6..d7d7d0841b7 100644
--- a/frontend/discourse/admin/components/dashboard/section.gjs
+++ b/frontend/discourse/admin/components/dashboard/section.gjs
@@ -22,7 +22,8 @@ export default class DashboardSection extends Component {
<DButton
@icon={{@headerActionIcon}}
@action={{@headerAction}}
- class="btn-transparent no-text"
+ @label={{@headerActionLabel}}
+ class="btn-default btn-small"
/>
</div>
{{/if}}
diff --git a/frontend/discourse/admin/components/modal/manage-reports.gjs b/frontend/discourse/admin/components/modal/manage-reports.gjs
index c2b4a223e33..5bfe89f5e30 100644
--- a/frontend/discourse/admin/components/modal/manage-reports.gjs
+++ b/frontend/discourse/admin/components/modal/manage-reports.gjs
@@ -142,7 +142,9 @@ class ManageReportsRow extends Component {
<div class="manage-reports__row-heading">
<span class="manage-reports__title">{{@row.title}}</span>
{{#if @row.label}}
- {{@row.label}}
+ <span class="db-report__label">
+ {{@row.label}}
+ </span>
{{/if}}
</div>
{{#if @row.description}}