Commit 3b92e141 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'Update-deprecated-GlIcon-properties-in-file_icon-vue-file' into 'master'

Fix deprecated GlIcon size and property

See merge request gitlab-org/gitlab!63014
parents 88233b2b 4db28300
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
<slot name="filepath-prepend"></slot> <slot name="filepath-prepend"></slot>
<template v-if="blob.path"> <template v-if="blob.path">
<file-icon :file-name="blob.path" :size="18" aria-hidden="true" css-classes="mr-2" /> <file-icon :file-name="blob.path" :size="16" aria-hidden="true" css-classes="mr-2" />
<strong <strong
class="file-title-name mr-1 js-blob-header-filepath" class="file-title-name mr-1 js-blob-header-filepath"
data-qa-selector="file_title_content" data-qa-selector="file_title_content"
......
...@@ -306,7 +306,7 @@ export default { ...@@ -306,7 +306,7 @@ export default {
> >
<file-icon <file-icon
:file-name="filePath" :file-name="filePath"
:size="18" :size="16"
aria-hidden="true" aria-hidden="true"
css-classes="gl-mr-2" css-classes="gl-mr-2"
:submodule="diffFile.submodule" :submodule="diffFile.submodule"
......
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
<div v-if="hasCode" class="d-inline-block cursor-pointer" @click="toggle()"> <div v-if="hasCode" class="d-inline-block cursor-pointer" @click="toggle()">
<gl-icon :name="collapseIcon" :size="16" class="gl-mr-2" /> <gl-icon :name="collapseIcon" :size="16" class="gl-mr-2" />
</div> </div>
<file-icon :file-name="filePath" :size="18" aria-hidden="true" css-classes="gl-mr-2" /> <file-icon :file-name="filePath" :size="16" aria-hidden="true" css-classes="gl-mr-2" />
<strong <strong
v-gl-tooltip v-gl-tooltip
:title="filePath" :title="filePath"
......
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
> >
<div class="js-file-title file-title file-title-flex-parent cursor-default"> <div class="js-file-title file-title file-title-flex-parent cursor-default">
<div class="file-header-content" data-testid="file-name"> <div class="file-header-content" data-testid="file-name">
<file-icon :file-name="file.filePath" :size="18" css-classes="gl-mr-2" /> <file-icon :file-name="file.filePath" :size="16" css-classes="gl-mr-2" />
<strong class="file-title-name">{{ file.filePath }}</strong> <strong class="file-title-name">{{ file.filePath }}</strong>
</div> </div>
<div class="file-actions d-flex align-items-center gl-ml-auto gl-align-self-start"> <div class="file-actions d-flex align-items-center gl-ml-auto gl-align-self-start">
......
...@@ -95,7 +95,6 @@ export default { ...@@ -95,7 +95,6 @@ export default {
:name="folderIconName" :name="folderIconName"
:size="size" :size="size"
class="folder-icon" class="folder-icon"
use-deprecated-sizes
data-qa-selector="folder_icon_content" data-qa-selector="folder_icon_content"
/> />
</span> </span>
......
...@@ -10,7 +10,7 @@ exports[`Blob Header Filepath rendering matches the snapshot 1`] = ` ...@@ -10,7 +10,7 @@ exports[`Blob Header Filepath rendering matches the snapshot 1`] = `
cssclasses="mr-2" cssclasses="mr-2"
filemode="" filemode=""
filename="foo/bar/dummy.md" filename="foo/bar/dummy.md"
size="18" size="16"
/> />
<strong <strong
......
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