diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-07 01:58:06 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-07 01:58:06 +0300 |
| commit | 07d5ee361a438fcfff28fe184bbec2aa98ce5d14 (patch) | |
| tree | 664ac50b0496dd42e3aaf81c2be153d753f007c8 | |
| parent | d96d0ec17dd37513e57988643fef65ae7773815a (diff) | |
| parent | af21dd74403354d56953626bce0b87d26d4881ae (diff) | |
Merge branch 'remove-zebra-table-background' into 'master'
Remove striped table styling of Find files view
Closes #51162
See merge request gitlab-org/gitlab-ce!21560
| -rw-r--r-- | app/views/admin/applications/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/find_file/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-zebra-table-background.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml index 94d33fa6489..2cdf98075d1 100644 --- a/app/views/admin/applications/index.html.haml +++ b/app/views/admin/applications/index.html.haml @@ -5,7 +5,7 @@ System OAuth applications don't belong to any user and can only be managed by admins %hr %p= link_to 'New application', new_admin_application_path, class: 'btn btn-success' -%table.table.table-striped +%table.table %thead %tr %th Name diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml index a966bfb2dd9..996c7b1b960 100644 --- a/app/views/projects/find_file/show.html.haml +++ b/app/views/projects/find_file/show.html.haml @@ -13,6 +13,6 @@ .tree-content-holder .table-holder - %table.table.files-slider{ class: "table_#{@hex_path} tree-table table-striped" } + %table.table.files-slider{ class: "table_#{@hex_path} tree-table" } %tbody = spinner nil, true diff --git a/changelogs/unreleased/remove-zebra-table-background.yml b/changelogs/unreleased/remove-zebra-table-background.yml new file mode 100644 index 00000000000..dafba72035d --- /dev/null +++ b/changelogs/unreleased/remove-zebra-table-background.yml @@ -0,0 +1,5 @@ +--- +title: Remove striped table styling of Find files and Admin Area Applications views +merge_request: 21560 +author: Andreas Kämmerle +type: other |