Merge 3e03544b5c into 2d8fed23e6

Fix missing top border on Admin Hashtags UI
Closes #31212
2024-11-26 15:31:52 +00:00 · 2024-11-25 11:05:05 +00:00 · 2024-08-15 19:41:43 +02:00
2 changed files with 10 additions and 1 deletions
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@ -149,6 +149,14 @@ a.table-action-link {
 }
 .batch-table {
  &--no-toolbar {
    .batch-table__toolbar {
      position: static;
      height: 4px;
      border-bottom: none;
    }
  }
  &__toolbar,
  &__row {
    display: flex;
--- a/app/views/admin/tags/index.html.haml
+++ b/app/views/admin/tags/index.html.haml
@ -29,7 +29,8 @@
 %hr.spacer/
-.batch-table
+.batch-table.batch-table--no-toolbar
  .batch-table__toolbar
  .batch-table__body
    - if @tags.empty?
      = nothing_here 'nothing-here--under-tabs nothing-here--no-toolbar'
Author	SHA1	Message	Date
Emelia Smith	8908c91489	Merge `3e03544b5c` into `2d8fed23e6`	2024-11-25 11:05:05 +00:00
Emelia Smith	3e03544b5c	Fix missing top border on Admin Hashtags UI Closes #31212	2024-08-15 19:41:43 +02:00