diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-06 19:58:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-06 19:58:22 +0000 |
| commit | 2838bb4d7b2e9634baffe764351abbab2bb929a7 (patch) | |
| tree | e36a6762d59ea8a35b28a37f015543b64ba68afb | |
| parent | de20452910c2335a1ee077e62269fa62606484d5 (diff) | |
| parent | be2486152fd9c38619a3aa65241c0643bde39a71 (diff) | |
| download | gitlab-ce-2838bb4d7b2e9634baffe764351abbab2bb929a7.tar.gz | |
Merge branch '46698-project-homepage-plus-dropdown-on-mobile-screens' into 'master'
Resolve "Project homepage > Plus dropdown on mobile screens"
Closes #46698
See merge request gitlab-org/gitlab-ce!19417
| -rw-r--r-- | app/assets/stylesheets/framework/tables.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/tree/_tree_header.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index a10bd1544c5..10c23f6c407 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -1,5 +1,6 @@ .table-holder { margin: 0; + overflow: auto; } table { diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index 4fc1a284693..9d196075bf1 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -6,7 +6,7 @@ = render 'shared/ref_switcher', destination: 'tree', path: @path, show_create: true - if on_top_of_branch? - - addtotree_toggle_attributes = { href: '#', 'data-toggle': 'dropdown', 'data-target': '.add-to-tree-dropdown' } + - addtotree_toggle_attributes = { href: '#', 'data-toggle': 'dropdown', 'data-target': '.add-to-tree-dropdown', 'data-boundary': 'window' } - else - addtotree_toggle_attributes = { title: _("You can only add files when you are on a branch"), data: { container: 'body' }, class: 'disabled has-tooltip' } |