kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed long filename being under action buttons 

Closes #26607
This commit is contained in:
Phil Hughes 2017-03-01 10:04:58 +00:00
parent 6b4d490782
commit e598c41f16
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/framework/files.scss
View File

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

9
app/views/projects/blob/_actions.html.haml
View File

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

13
app/views/projects/blob/_blob.html.haml
View File

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

4
changelogs/unreleased/long-file-name-overflow.yml Normal file
View File

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