Commit 98db2e96 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '61323-snippet-copy-icon-button-is-misaligned' into 'master'

Resolve "Snippet icon button is misaligned"

Closes #61323

See merge request gitlab-org/gitlab-ce!28522
parents 82ccc8bc f88ffe41
......@@ -240,7 +240,7 @@ export default {
css-class="btn-default btn-transparent btn-clipboard"
/>
<small v-if="isModeChanged" ref="fileMode">
<small v-if="isModeChanged" ref="fileMode" class="mr-1">
{{ diffFile.a_mode }}{{ diffFile.b_mode }}
</small>
......
......@@ -339,6 +339,8 @@
svg {
top: auto;
width: 16px;
height: 16px;
}
}
......
......@@ -366,10 +366,6 @@ span.idiff {
color: $gl-text-color;
}
small {
margin: 0 10px 0 0;
}
.file-actions .btn {
padding: 0 10px;
font-size: 13px;
......
......@@ -22,6 +22,10 @@
.snippet-file-content {
border-radius: 3px;
.file-title-flex-parent .btn-clipboard {
line-height: 28px;
}
}
.snippet-header {
......
......@@ -188,7 +188,7 @@ module BlobHelper
end
def copy_file_path_button(file_path)
clipboard_button(text: file_path, gfm: "`#{file_path}`", class: 'btn-clipboard btn-transparent prepend-left-5', title: 'Copy file path to clipboard')
clipboard_button(text: file_path, gfm: "`#{file_path}`", class: 'btn-clipboard btn-transparent', title: 'Copy file path to clipboard')
end
def copy_blob_source_button(blob)
......
......@@ -6,7 +6,7 @@
= copy_file_path_button(blob.path)
%small
%small.mr-1
= number_to_human_size(blob.raw_size)
- if blob.stored_externally? && blob.external_storage == :lfs
......
---
title: Resolve Snippet icon button is misaligned
merge_request: 28522
author: Marcel van Remmerden
type: other
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