Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
e598c41f
Commit
e598c41f
authored
Mar 01, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed long filename being under action buttons
Closes #26607
parent
6b4d4907
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
10 deletions
+17
-10
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+1
-0
app/views/projects/blob/_actions.html.haml
app/views/projects/blob/_actions.html.haml
+5
-4
app/views/projects/blob/_blob.html.haml
app/views/projects/blob/_blob.html.haml
+7
-6
changelogs/unreleased/long-file-name-overflow.yml
changelogs/unreleased/long-file-name-overflow.yml
+4
-0
No files found.
app/assets/stylesheets/framework/files.scss
View file @
e598c41f
...
@@ -271,6 +271,7 @@ span.idiff {
...
@@ -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
;
}
}
}
}
}
}
app/views/projects/blob/_actions.html.haml
View file @
e598c41f
.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 @@
...
@@ -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
...
...
app/views/projects/blob/_blob.html.haml
View file @
e598c41f
...
@@ -24,12 +24,13 @@
...
@@ -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
changelogs/unreleased/long-file-name-overflow.yml
0 → 100644
View file @
e598c41f
---
title
:
Fixed long file names overflowing under action buttons
merge_request
:
author
:
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