Skip to content

Simplify .load-more CSS classes #10989

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
merged 2 commits into from
Apr 11, 2025
Merged

Simplify .load-more CSS classes #10989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e815ec0
Extract global `.load-more-button` CSS class
Turbo87 Apr 11, 2025
f24b03d
Remove global `.load-more` class
Turbo87 Apr 11, 2025
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
17 changes: 1 addition & 16 deletions app/styles/dashboard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,7 @@
text-align: right;
}

:global(.load-more) {
.load-more {
padding: var(--space-s);
border-top: 1px solid light-dark(hsla(51, 90%, 42%, .25), #232321);

button {
display: block;
text-align: center;
width: 100%;
padding: var(--space-2xs);
outline: 0;
border: 0;
background-color: light-dark(#dbd9cf, #202023);
color: light-dark(#525252, #f9f7ec);

&:hover, &:focus {
background-color: light-dark(#c5c2b2, #26262b);
}
}
}
15 changes: 15 additions & 0 deletions app/styles/shared/buttons.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,18 @@
:global(.button--small) {
padding: var(--space-2xs) var(--space-s);
}

:global(.load-more-button) {
display: block;
text-align: center;
width: 100%;
padding: var(--space-2xs);
outline: 0;
border: 0;
background-color: light-dark(#dbd9cf, #202023);
color: light-dark(#525252, #f9f7ec);

&:hover, &:focus {
background-color: light-dark(#c5c2b2, #26262b);
}
}
3 changes: 2 additions & 1 deletion app/templates/crate/versions.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
{{/each}}
</ul>
{{#if (or this.loadMoreTask.isRunning this.next_page)}}
<div local-class="load-more" class="load-more">
<div local-class="load-more">
<button
type="button"
class="load-more-button"
data-test-id={{if this.loadMoreTask.isRunning "loading" "load-more"}}
disabled={{this.loadMoreTask.isRunning}}
{{on "click" (perform this.loadMoreTask)}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
</ul>

{{#if this.hasMore}}
<div class="load-more">
<button type="button" disabled={{this.loadMoreTask.isRunning}} {{on "click" (perform this.loadMoreTask)}}>
<div local-class="load-more">
<button type="button" class="load-more-button" disabled={{this.loadMoreTask.isRunning}} {{on "click" (perform this.loadMoreTask)}}>
Load More
{{#if this.loadMoreTask.isRunning}}
<LoadingSpinner />
Expand Down
2 changes: 0 additions & 2 deletions ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ module.exports = function (defaults) {
'crates-io/styles/shared/sort-by',
'crates-io/styles/shared/typography',
'crates-io/styles/application',
// for the `.load-more` class
'crates-io/styles/dashboard',
// for the `.scopes-list` class
'crates-io/styles/settings/tokens/new',
// for the `.box-link` class
Expand Down
Loading