Commit 574b3a51 authored by André Luís's avatar André Luís Committed by Fatih Acet
Browse files

Resolve "Merge request refactor: Title and copy to clipboard button are behind the action buttons"

parent 516e3baad346
...@@ -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-md-block" class="file-actions d-none d-sm-block"
> >
<template <template
v-if="diffFile.blob && diffFile.blob.readableText" v-if="diffFile.blob && diffFile.blob.readableText"
......
...@@ -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 {
......
---
title: Fix overlapping file title and file actions in MR changes tag
merge_request:
author:
type: fixed
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