summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-08-19 23:55:30 +0000
committerMike Greiling <mike@pixelcog.com>2019-08-19 23:55:30 +0000
commitb19707b8bd76730416f9db05ef1469305ed68632 (patch)
treed6d5076c33ce15e2aac56bf872e3c3a6df97d1f9 /app
parent0bdee4c2f885462a55b67a798ec242321dfe67e3 (diff)
parent3488da59363a5edfbf431a37ba59247b836bc50a (diff)
downloadgitlab-ce-b19707b8bd76730416f9db05ef1469305ed68632.tar.gz
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
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/diffs/components/diff_expansion_cell.vue6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
index 925385fa98a..43edc116ed1 100644
--- a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
+++ b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
@@ -223,8 +223,7 @@ export default {
:title="__('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-left" aria-hidden="true" style="transform: rotate(270deg);" />
+ <icon :size="12" name="expand-up" aria-hidden="true" />
</a>
<a class="mx-2 cursor-pointer js-unfold-all" @click="handleExpandLines()">
<span>{{ s__('Diffs|Show all lines') }}</span>
@@ -238,8 +237,7 @@ export default {
:title="__('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-left" aria-hidden="true" style="transform: rotate(90deg);" />
+ <icon :size="12" name="expand-down" aria-hidden="true" />
</a>
</div>
</td>