diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-04-26 13:13:02 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-04-26 13:13:02 +0000 |
| commit | 2bde344217ee40d8efdbfa3adce00974b3c37baa (patch) | |
| tree | 2c0f2535642def84b194334fb3bacca53bed9fca /app | |
| parent | 8fbda3bf152b6b15f30754cbc68c7466e86b8ee9 (diff) | |
| parent | d2765b453f1103721fef24581f8a24e7a0397252 (diff) | |
| download | gitlab-ce-2bde344217ee40d8efdbfa3adce00974b3c37baa.tar.gz | |
Merge branch '22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master'
[#22826] Ensure find_file_link and download button is part of file tree header
Closes #22826
See merge request !9847
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/tree/_tree_header.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/tree/show.html.haml | 10 |
3 files changed, 5 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index f3916622b6f..03c75ce61f5 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -160,7 +160,6 @@ .tree-controls { float: right; - margin-top: 11px; position: relative; z-index: 2; diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index 259207a6dfd..e7b3fe3ffda 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -1,3 +1,7 @@ +.tree-controls + = render 'projects/find_file_link' + = render 'projects/buttons/download', project: @project, ref: @ref + .tree-ref-holder = render 'shared/ref_switcher', destination: 'tree', path: @path diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml index a2a26039220..910d765aed0 100644 --- a/app/views/projects/tree/show.html.haml +++ b/app/views/projects/tree/show.html.haml @@ -7,12 +7,4 @@ = render 'projects/last_push' %div{ class: container_class } - .tree-controls - = render 'projects/find_file_link' - = render 'projects/buttons/download', project: @project, ref: @ref - - #tree-holder.tree-holder.clearfix - .nav-block - = render 'projects/tree/tree_header', tree: @tree - - = render 'projects/tree/tree_content', tree: @tree + = render 'projects/files' |