diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-08-19 23:55:30 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-08-19 23:55:30 +0000 |
| commit | b19707b8bd76730416f9db05ef1469305ed68632 (patch) | |
| tree | d6d5076c33ce15e2aac56bf872e3c3a6df97d1f9 | |
| parent | 0bdee4c2f885462a55b67a798ec242321dfe67e3 (diff) | |
| parent | 3488da59363a5edfbf431a37ba59247b836bc50a (diff) | |
| download | gitlab-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
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_expansion_cell.vue | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/66161-replace-expand-icons.yml | 5 |
2 files changed, 7 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> diff --git a/changelogs/unreleased/66161-replace-expand-icons.yml b/changelogs/unreleased/66161-replace-expand-icons.yml new file mode 100644 index 00000000000..e28e01108a8 --- /dev/null +++ b/changelogs/unreleased/66161-replace-expand-icons.yml @@ -0,0 +1,5 @@ +--- +title: Replaced expand diff icons +merge_request: 31907 +author: +type: changed |