Merge branch 'long-file-name-overflow' into 'master'

Fixed long filename being under action buttons

Closes #26607

See merge request !9608
This commit is contained in:
Filipa Lacerda 2017-03-01 17:12:15 +00:00
commit 46bf2c2f7b
4 changed files with 17 additions and 10 deletions

View file

@ -271,6 +271,7 @@ span.idiff {
font-size: 13px;
line-height: 28px;
display: inline-block;
float: none;
}
}
}

View file

@ -1,7 +1,8 @@
.btn-group
= view_on_environment_button(@commit.sha, @path, @environment) if @environment
- if @environment
.btn-group<
= view_on_environment_button(@commit.sha, @path, @environment)
.btn-group.tree-btn-group
.btn-group{ role: "group" }<
= link_to 'Raw', namespace_project_raw_path(@project.namespace, @project, @id),
class: 'btn btn-sm', target: '_blank'
-# only show normal/blame view links for text files
@ -18,7 +19,7 @@
tree_join(@commit.sha, @path)), class: 'btn btn-sm js-data-file-blob-permalink-url'
- if current_user
.btn-group{ role: "group" }
.btn-group{ role: "group" }<
- if blob_text_viewable?(@blob)
= edit_blob_link
= replace_blob_link

View file

@ -24,12 +24,13 @@
#blob-content-holder.blob-content-holder
%article.file-holder
.js-file-title.file-title
= blob_icon blob.mode, blob.name
%strong
= blob.name
%small
= number_to_human_size(blob_size(blob))
.js-file-title.file-title-flex-parent
.file-header-content
= blob_icon blob.mode, blob.name
%strong.file-title-name
= blob.name
%small
= number_to_human_size(blob_size(blob))
.file-actions.hidden-xs
= render "actions"
= render blob, blob: blob

View file

@ -0,0 +1,4 @@
---
title: Fixed long file names overflowing under action buttons
merge_request:
author: