Skip to content

Commit

Permalink
Fix batch actions being hidden from mobile view (mastodon#12183)
Browse files Browse the repository at this point in the history
On mobile, batch actions are hidden from the settings/admin interface,
but there are several places those actions can only be performed through
batch actions.

This may not look great, but at least it makes the actions available again.
  • Loading branch information
ClearlyClaire authored and Gargron committed Oct 24, 2019
1 parent 9762fe3 commit aa884e0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
17 changes: 8 additions & 9 deletions app/javascript/styles/mastodon/tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,6 @@ a.table-action-link {
margin-top: 0;
}
}

@media screen and (max-width: $no-gap-breakpoint) {
display: none;
}
}

&__actions,
Expand All @@ -174,10 +170,6 @@ a.table-action-link {
text-align: right;
padding-right: 16px - 5px;
}

@media screen and (max-width: $no-gap-breakpoint) {
display: none;
}
}

&__form {
Expand All @@ -198,7 +190,7 @@ a.table-action-link {
background: darken($ui-base-color, 4%);

@media screen and (max-width: $no-gap-breakpoint) {
&:first-child {
.optional &:first-child {
border-top: 1px solid darken($ui-base-color, 8%);
}
}
Expand Down Expand Up @@ -264,6 +256,13 @@ a.table-action-link {
}
}

&.optional .batch-table__toolbar,
&.optional .batch-table__row__select {
@media screen and (max-width: $no-gap-breakpoint) {
display: none;
}
}

.status__content {
padding-top: 0;

Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/tags/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- Admin::FilterHelper::TAGS_FILTERS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?

.batch-table
.batch-table.optional
.batch-table__toolbar
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
Expand Down

0 comments on commit aa884e0

Please sign in to comment.