Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f88ffe41
Commit
f88ffe41
authored
May 30, 2019
by
Marcel van Remmerden
Committed by
Annabel Dunstone Gray
May 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get copy to clipboard button aligned within snippet header
parent
82ccc8bc
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
7 deletions
+14
-7
app/assets/javascripts/diffs/components/diff_file_header.vue
app/assets/javascripts/diffs/components/diff_file_header.vue
+1
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+2
-0
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+0
-4
app/assets/stylesheets/framework/snippets.scss
app/assets/stylesheets/framework/snippets.scss
+4
-0
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+1
-1
app/views/projects/blob/_header_content.html.haml
app/views/projects/blob/_header_content.html.haml
+1
-1
changelogs/unreleased/61323-snippet-copy-icon-button-is-misaligned.yml
...released/61323-snippet-copy-icon-button-is-misaligned.yml
+5
-0
No files found.
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @
f88ffe41
...
@@ -240,7 +240,7 @@ export default {
...
@@ -240,7 +240,7 @@ export default {
css-class=
"btn-default btn-transparent btn-clipboard"
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
}}
{{
diffFile
.
a_mode
}}
→
{{
diffFile
.
b_mode
}}
</small>
</small>
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
f88ffe41
...
@@ -339,6 +339,8 @@
...
@@ -339,6 +339,8 @@
svg
{
svg
{
top
:
auto
;
top
:
auto
;
width
:
16px
;
height
:
16px
;
}
}
}
}
...
...
app/assets/stylesheets/framework/files.scss
View file @
f88ffe41
...
@@ -366,10 +366,6 @@ span.idiff {
...
@@ -366,10 +366,6 @@ span.idiff {
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
small
{
margin
:
0
10px
0
0
;
}
.file-actions
.btn
{
.file-actions
.btn
{
padding
:
0
10px
;
padding
:
0
10px
;
font-size
:
13px
;
font-size
:
13px
;
...
...
app/assets/stylesheets/framework/snippets.scss
View file @
f88ffe41
...
@@ -22,6 +22,10 @@
...
@@ -22,6 +22,10 @@
.snippet-file-content
{
.snippet-file-content
{
border-radius
:
3px
;
border-radius
:
3px
;
.file-title-flex-parent
.btn-clipboard
{
line-height
:
28px
;
}
}
}
.snippet-header
{
.snippet-header
{
...
...
app/helpers/blob_helper.rb
View file @
f88ffe41
...
@@ -188,7 +188,7 @@ module BlobHelper
...
@@ -188,7 +188,7 @@ module BlobHelper
end
end
def
copy_file_path_button
(
file_path
)
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
end
def
copy_blob_source_button
(
blob
)
def
copy_blob_source_button
(
blob
)
...
...
app/views/projects/blob/_header_content.html.haml
View file @
f88ffe41
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
=
copy_file_path_button
(
blob
.
path
)
=
copy_file_path_button
(
blob
.
path
)
%small
%small
.mr-1
=
number_to_human_size
(
blob
.
raw_size
)
=
number_to_human_size
(
blob
.
raw_size
)
-
if
blob
.
stored_externally?
&&
blob
.
external_storage
==
:lfs
-
if
blob
.
stored_externally?
&&
blob
.
external_storage
==
:lfs
...
...
changelogs/unreleased/61323-snippet-copy-icon-button-is-misaligned.yml
0 → 100644
View file @
f88ffe41
---
title
:
Resolve Snippet icon button is misaligned
merge_request
:
28522
author
:
Marcel van Remmerden
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment