Skip to content

UX: Change from legacy d-admin-table CSS to d-table classes #305

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
martin-brennan merged 1 commit into from
Feb 25, 2026
Merged

UX: Change from legacy d-admin-table CSS to d-table classes #305

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
26 changes: 12 additions & 14 deletions admin/assets/javascripts/discourse/components/repo-status.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,20 @@ export default class RepoStatus extends Component {
}

<template>
<tr
class="d-admin-row__content repo {{if @repo.hasNewVersion 'has-update'}}"
>
<td class="d-admin-row__overview">
<div class="d-admin-row__overview-name">
<tr class="d-table__row repo {{if @repo.hasNewVersion 'has-update'}}">
<td class="d-table__cell --overview">
<div class="d-table__overview-name">
{{@repo.nameTitleized}}
</div>

{{#if @repo.author}}
<div class="d-admin-row__overview-author">
<div class="d-table__overview-author">
{{@repo.author}}
</div>
{{/if}}

{{#if @repo.plugin}}
<div class="d-admin-row__overview-about">
<div class="d-table__overview-about">
{{@repo.plugin.about}}

{{#if @repo.linkUrl}}
Expand All @@ -82,22 +80,22 @@ export default class RepoStatus extends Component {
{{/if}}
</td>

<td class="d-admin-row__detail">
<div class="d-admin-row__mobile-label">
<td class="d-table__cell --detail">
<div class="d-table__mobile-label">
{{i18n "admin.docker.repo.commit_hash"}}
</div>
{{commitUrl "current" @repo.version @repo.prettyVersion @repo.url}}
</td>

<td class="d-admin-row__detail">
<div class="d-admin-row__mobile-label">
<td class="d-table__cell --detail">
<div class="d-table__mobile-label">
{{i18n "admin.docker.repo.last_updated"}}
</div>
{{formatDate @repo.latest.date leaveAgo="true"}}
</td>

<td class="d-admin-row__detail">
<div class="d-admin-row__mobile-label">
<td class="d-table__cell --detail">
<div class="d-table__mobile-label">
{{i18n "admin.docker.repo.latest_version"}}
</div>
<div class="repo__latest-version">
Expand All @@ -120,7 +118,7 @@ export default class RepoStatus extends Component {
</div>
</td>

<td class="d-admin-row__controls">
<td class="d-table__cell --controls">
{{#if @repo.checkingStatus}}
<div class="status-label --loading">
{{i18n "admin.docker.checking"}}
Expand Down
4 changes: 2 additions & 2 deletions admin/assets/javascripts/discourse/templates/update/index.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export default RouteTemplate(
</p>
{{else}}

<table class="d-admin-table" id="repos">
<thead>
<table class="d-table" id="repos">
<thead class="d-table__header">
<th>{{i18n "admin.docker.repo.name"}}</th>
<th>{{i18n "admin.docker.repo.commit_hash"}}</th>
<th>{{i18n "admin.docker.repo.last_updated"}}</th>
Expand Down
8 changes: 4 additions & 4 deletions assets/stylesheets/common/docker-manager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,20 @@
}
}

.d-admin-table {
.d-table {
margin-bottom: var(--space-6);
}

.d-admin-row__content.repo {
.d-admin-row__overview {
.d-table__row.repo {
.d-table__cell.--overview {
width: 45%;

@include breakpoint("tablet") {
width: auto;
}
}

.d-admin-row__controls {
.d-table__cell.--controls {
width: 12%; // set width to minimize layout shift
text-align: left;

Expand Down
6 changes: 3 additions & 3 deletions spec/system/admin_update_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
visit("/admin/update")

expect(page).to have_css("h3", exact_text: I18n.t("js.admin.docker.update_title"))
expect(page).to have_css("tr.repo .d-admin-row__overview-name", exact_text: "Discourse")
expect(page).to have_css("tr.repo .d-admin-row__overview-name", exact_text: "Docker Manager")
expect(page).to have_css("tr.repo .d-table__overview-name", exact_text: "Discourse")
expect(page).to have_css("tr.repo .d-table__overview-name", exact_text: "Docker Manager")
expect(page).to have_css(
"tr.repo .d-admin-row__overview-about a[href='https://meta.discourse.org/t/12655']",
"tr.repo .d-table__overview-about a[href='https://meta.discourse.org/t/12655']",
)
ensure
puts page.html if ENV["CI"]
Expand Down
2 changes: 1 addition & 1 deletion test/javascripts/integration/components/repo-status-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ module("Integration | Component | RepoStatus", function (hooks) {
);

assert
.dom("div.d-admin-row__overview-author")
.dom("div.d-table__overview-author")
.hasText("By Discourse", "shows plugin author");
});

Expand Down