Commit b19707b8 authored by Mike Greiling's avatar Mike Greiling

Merge branch '66161-replace-expand-icons' into 'master'

Resolve "Use new "Expand up" and "Expand down" icons for diff expansion icons"

Closes #66161

See merge request gitlab-org/gitlab-ce!31907
parents 0bdee4c2 3488da59
...@@ -223,8 +223,7 @@ export default { ...@@ -223,8 +223,7 @@ export default {
:title="__('Expand up')" :title="__('Expand up')"
@click="handleExpandLines(EXPAND_UP)" @click="handleExpandLines(EXPAND_UP)"
> >
<!-- TODO: remove style & replace with correct icon, waiting for MR https://gitlab.com/gitlab-org/gitlab-design/issues/499 --> <icon :size="12" name="expand-up" aria-hidden="true" />
<icon :size="12" name="expand-left" aria-hidden="true" style="transform: rotate(270deg);" />
</a> </a>
<a class="mx-2 cursor-pointer js-unfold-all" @click="handleExpandLines()"> <a class="mx-2 cursor-pointer js-unfold-all" @click="handleExpandLines()">
<span>{{ s__('Diffs|Show all lines') }}</span> <span>{{ s__('Diffs|Show all lines') }}</span>
...@@ -238,8 +237,7 @@ export default { ...@@ -238,8 +237,7 @@ export default {
:title="__('Expand down')" :title="__('Expand down')"
@click="handleExpandLines(EXPAND_DOWN)" @click="handleExpandLines(EXPAND_DOWN)"
> >
<!-- TODO: remove style & replace with correct icon, waiting for MR https://gitlab.com/gitlab-org/gitlab-design/issues/499 --> <icon :size="12" name="expand-down" aria-hidden="true" />
<icon :size="12" name="expand-left" aria-hidden="true" style="transform: rotate(90deg);" />
</a> </a>
</div> </div>
</td> </td>
......
---
title: Replaced expand diff icons
merge_request: 31907
author:
type: changed
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