kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

Closes #66161

See merge request gitlab-org/gitlab-ce!31907
This commit is contained in:
Mike Greiling 2019-08-19 23:55:30 +00:00
commit b19707b8bd
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/diffs/components/diff_expansion_cell.vue
View file

@ -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>

5
changelogs/unreleased/66161-replace-expand-icons.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Replaced expand diff icons
merge_request: 31907
author:
type: changed