Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
15a7b6e7b5db
Commit
574b3a51
authored
Jun 29, 2018
by
André Luís
Committed by
Fatih Acet
Jun 29, 2018
Browse files
Resolve "Merge request refactor: Title and copy to clipboard button are behind the action buttons"
parent
516e3baad346
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @
15a7b6e7
...
@@ -201,7 +201,7 @@ export default {
...
@@ -201,7 +201,7 @@ export default {
<div
<div
v-if=
"!diffFile.submodule && addMergeRequestButtons"
v-if=
"!diffFile.submodule && addMergeRequestButtons"
class=
"file-actions d-none d-m
d
-block"
class=
"file-actions d-none d-
s
m-block"
>
>
<template
<template
v-if=
"diffFile.blob && diffFile.blob.readableText"
v-if=
"diffFile.blob && diffFile.blob.readableText"
...
...
app/assets/stylesheets/framework/files.scss
View file @
15a7b6e7
...
@@ -322,14 +322,17 @@ span.idiff {
...
@@ -322,14 +322,17 @@ span.idiff {
}
}
.file-title-flex-parent
{
.file-title-flex-parent
{
display
:
flex
;
&
,
align-items
:
center
;
.file-holder
&
{
justify-content
:
space-between
;
display
:
flex
;
background-color
:
$gray-light
;
align-items
:
center
;
border-bottom
:
1px
solid
$border-color
;
justify-content
:
space-between
;
padding
:
5px
$gl-padding
;
background-color
:
$gray-light
;
margin
:
0
;
border-bottom
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
padding
:
5px
$gl-padding
;
margin
:
0
;
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
}
.file-header-content
{
.file-header-content
{
white-space
:
nowrap
;
white-space
:
nowrap
;
...
@@ -337,6 +340,17 @@ span.idiff {
...
@@ -337,6 +340,17 @@ span.idiff {
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
padding-right
:
30px
;
padding-right
:
30px
;
position
:
relative
;
position
:
relative
;
width
:
auto
;
@media
(
max-width
:
map-get
(
$grid-breakpoints
,
sm
)
-1
)
{
width
:
100%
;
}
}
.file-holder
&
{
.file-actions
{
position
:
static
;
}
}
}
.btn-clipboard
{
.btn-clipboard
{
...
...
changelogs/unreleased/48603-merge-request-refactor-title-and-copy-to-clipboard-button-are-behind-the-action-buttons.yml
0 → 100644
View file @
15a7b6e7
---
title
:
Fix overlapping file title and file actions in MR changes tag
merge_request
:
author
:
type
:
fixed
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