diff options
| author | André Luís <me@andr3.net> | 2018-06-29 18:41:34 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-06-29 18:41:34 +0000 |
| commit | 28170488e569d03012cc00cdb6d0a553db031675 (patch) | |
| tree | 250bc34bec589cd1787256034b0af475788687f3 /app | |
| parent | efaca5ded0033a60b822f4081c29b1544ed321c7 (diff) | |
| download | gitlab-ce-28170488e569d03012cc00cdb6d0a553db031675.tar.gz | |
Resolve "Merge request refactor: Title and copy to clipboard button are behind the action buttons"
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file_header.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 30 |
2 files changed, 23 insertions, 9 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue index 6bad389f778..1176ca25b7b 100644 --- a/app/assets/javascripts/diffs/components/diff_file_header.vue +++ b/app/assets/javascripts/diffs/components/diff_file_header.vue @@ -201,7 +201,7 @@ export default { <div v-if="!diffFile.submodule && addMergeRequestButtons" - class="file-actions d-none d-md-block" + class="file-actions d-none d-sm-block" > <template v-if="diffFile.blob && diffFile.blob.readableText" diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index f060254777c..00eac1688f2 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -322,14 +322,17 @@ span.idiff { } .file-title-flex-parent { - display: flex; - align-items: center; - justify-content: space-between; - background-color: $gray-light; - border-bottom: 1px solid $border-color; - padding: 5px $gl-padding; - margin: 0; - border-radius: $border-radius-default $border-radius-default 0 0; + &, + .file-holder & { + display: flex; + align-items: center; + justify-content: space-between; + background-color: $gray-light; + border-bottom: 1px solid $border-color; + padding: 5px $gl-padding; + margin: 0; + border-radius: $border-radius-default $border-radius-default 0 0; + } .file-header-content { white-space: nowrap; @@ -337,6 +340,17 @@ span.idiff { text-overflow: ellipsis; padding-right: 30px; position: relative; + width: auto; + + @media (max-width: map-get($grid-breakpoints, sm)-1) { + width: 100%; + } + } + + .file-holder & { + .file-actions { + position: static; + } } .btn-clipboard { |