Commit 2818c251 authored by Justin Ho's avatar Justin Ho

Replace fa-arrow-* with GitLab SVG icons

- In shortcuts, use 12px icons to match previous text size.
- Replace both arrow icon and close icons in dropdown
and re-align both buttons to be centered to text.
- Replace arrow-left icons in sherlock views
- Add changelog
parent c2215a75
<script> <script>
import { GlTooltipDirective } from '@gitlab/ui'; import { GlButton, GlTooltipDirective } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
export default { export default {
components: {
GlButton,
},
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
}, },
...@@ -26,13 +29,12 @@ export default { ...@@ -26,13 +29,12 @@ export default {
<template> <template>
<div class="dropdown-page-two dropdown-new-label"> <div class="dropdown-page-two dropdown-new-label">
<div class="dropdown-title"> <div class="dropdown-title">
<button <gl-button
:aria-label="__('Go back')" :aria-label="__('Go back')"
type="button" category="tertiary"
class="dropdown-title-button dropdown-menu-back" class="dropdown-title-button dropdown-menu-back"
> icon="close"
<i aria-hidden="true" class="fa fa-arrow-left" data-hidden="true"> </i> />
</button>
{{ headerTitle }} {{ headerTitle }}
<button <button
:aria-label="__('Close')" :aria-label="__('Close')"
......
...@@ -600,7 +600,6 @@ ...@@ -600,7 +600,6 @@
top: 0; top: 0;
padding: 0; padding: 0;
color: $dropdown-title-btn-color; color: $dropdown-title-btn-color;
font-size: 14px;
border: 0; border: 0;
background: none; background: none;
outline: 0; outline: 0;
...@@ -611,7 +610,7 @@ ...@@ -611,7 +610,7 @@
} }
.dropdown-menu-close { .dropdown-menu-close {
top: $gl-padding-4; top: $gl-padding-6;
right: $gl-padding-8; right: $gl-padding-8;
width: 20px; width: 20px;
height: 20px; height: 20px;
...@@ -622,8 +621,8 @@ ...@@ -622,8 +621,8 @@
} }
.dropdown-menu-back { .dropdown-menu-back {
left: 7px; left: 10px;
top: 2px; top: $gl-padding-8;
} }
.dropdown-input { .dropdown-input {
......
...@@ -67,7 +67,7 @@ module DropdownsHelper ...@@ -67,7 +67,7 @@ module DropdownsHelper
if options.fetch(:back, false) if options.fetch(:back, false)
title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-back", aria: { label: "Go back" }, type: "button") do title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-back", aria: { label: "Go back" }, type: "button") do
icon('arrow-left') sprite_icon('arrow-left')
end end
end end
...@@ -75,7 +75,7 @@ module DropdownsHelper ...@@ -75,7 +75,7 @@ module DropdownsHelper
if options.fetch(:close, true) if options.fetch(:close, true)
title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-close", aria: { label: "Close" }, type: "button") do title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-close", aria: { label: "Close" }, type: "button") do
icon('times', class: 'dropdown-menu-close-icon') sprite_icon('close', css_class: 'dropdown-menu-close-icon')
end end
end end
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-up = sprite_icon('arrow-up', size: 12)
%td= _('Edit your most recent comment in a thread (from an empty textarea)') %td= _('Edit your most recent comment in a thread (from an empty textarea)')
%tbody %tbody
%tr %tr
...@@ -91,28 +91,28 @@ ...@@ -91,28 +91,28 @@
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-left = sprite_icon('arrow-left', size: 12)
\/ \/
%kbd h %kbd h
%td= _('Scroll left') %td= _('Scroll left')
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-right = sprite_icon('arrow-right', size: 12)
\/ \/
%kbd l %kbd l
%td= _('Scroll right') %td= _('Scroll right')
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-up = sprite_icon('arrow-up', size: 12)
\/ \/
%kbd k %kbd k
%td= _('Scroll up') %td= _('Scroll up')
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-down = sprite_icon('arrow-down', size: 12)
\/ \/
%kbd j %kbd j
%td= _('Scroll down') %td= _('Scroll down')
...@@ -120,14 +120,14 @@ ...@@ -120,14 +120,14 @@
%td.shortcut %td.shortcut
%kbd %kbd
shift shift
%i.fa.fa-arrow-up = sprite_icon('arrow-up', size: 12)
\/ k \/ k
%td= _('Scroll to top') %td= _('Scroll to top')
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
shift shift
%i.fa.fa-arrow-down = sprite_icon('arrow-down', size: 12)
\/ j \/ j
%td= _('Scroll to bottom') %td= _('Scroll to bottom')
.col-lg-4 .col-lg-4
...@@ -231,12 +231,12 @@ ...@@ -231,12 +231,12 @@
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-up = sprite_icon('arrow-up', size: 12)
%td= _('Move selection up') %td= _('Move selection up')
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-down = sprite_icon('arrow-down', size: 12)
%td= _('Move selection down') %td= _('Move selection down')
%tr %tr
%td.shortcut %td.shortcut
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.row-content-block .row-content-block
.float-right .float-right
= link_to(sherlock_transaction_path(@transaction), class: 'btn') do = link_to(sherlock_transaction_path(@transaction), class: 'btn') do
%i.fa.fa-arrow-left = sprite_icon('arrow-left')
= t('sherlock.transaction') = t('sherlock.transaction')
.oneline .oneline
= t('sherlock.file_sample') = t('sherlock.file_sample')
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
.row-content-block .row-content-block
.float-right .float-right
= link_to(sherlock_transaction_path(@transaction), class: 'btn') do = link_to(sherlock_transaction_path(@transaction), class: 'btn') do
%i.fa.fa-arrow-left = sprite_icon('arrow-left')
= t('sherlock.transaction') = t('sherlock.transaction')
.oneline .oneline
= t('sherlock.query') = t('sherlock.query')
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.row-content-block .row-content-block
.float-right .float-right
= link_to(sherlock_transactions_path, class: 'btn') do = link_to(sherlock_transactions_path, class: 'btn') do
%i.fa.fa-arrow-left = sprite_icon('arrow-left')
= t('sherlock.all_transactions') = t('sherlock.all_transactions')
.oneline .oneline
= t('sherlock.transaction') = t('sherlock.transaction')
......
---
title: Replace fa-arrow-* with GitLab SVG icons
merge_request: 41158
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