Commit 3340a4e0 authored by Simon Knox's avatar Simon Knox

Merge branch '264790-bs4-optimization-admin-abuse-reports' into 'master'

Remove d-md-none/d-sm-none when d-sm-none/d-none exists from Admin Abuse Reports

See merge request gitlab-org/gitlab!44845
parents 38f3f661 993a3e81
- reporter = abuse_report.reporter - reporter = abuse_report.reporter
- user = abuse_report.user - user = abuse_report.user
%tr %tr
%th.d-block.d-sm-none.d-md-none %th.d-block.d-sm-none
%strong= _('User') %strong= _('User')
%td %td
- if user - if user
...@@ -11,12 +11,13 @@ ...@@ -11,12 +11,13 @@
- else - else
= _('(removed)') = _('(removed)')
%td %td
%strong.subheading.d-block.d-sm-none.d-md-none %strong.subheading.d-block.d-sm-none
= _('Reported by %{reporter}') % { reporter: reporter ? link_to(reporter.name, reporter) : _('(removed)') } = _('Reported by %{reporter}') % { reporter: reporter ? link_to(reporter.name, reporter) : _('(removed)') }
.light.small .light.small
= time_ago_with_tooltip(abuse_report.created_at) = time_ago_with_tooltip(abuse_report.created_at)
%td %td
%strong.subheading.d-block.d-sm-none.d-md-none= _('Message') %strong.subheading.d-block.d-sm-none
= _('Message')
.message .message
= markdown_field(abuse_report, :message) = markdown_field(abuse_report, :message)
%td %td
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
- if @abuse_reports.present? - if @abuse_reports.present?
.table-holder .table-holder
%table.table.responsive-table %table.table.responsive-table
%thead.d-none.d-sm-none.d-md-table-header-group %thead.d-none.d-md-table-header-group
%tr %tr
%th User %th User
%th Reported by %th Reported by
......
---
title: Remove d-md-none/d-sm-none when d-sm-none/d-none exists
merge_request: 44845
author: Takuya Noguchi
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment