diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-17 20:27:04 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-17 20:27:04 +0300 |
commit | b2251810fef71fe5de8432333aef35321592eea6 (patch) | |
tree | c629c2cfa2ae49a7aeb5093f268b39fdfbdaeab1 | |
parent | d4feb781387a843586d5a01740c43f50ce7ad084 (diff) | |
parent | 6aca8b570c929e10f08a599f7bd4f3c7004f96d3 (diff) |
Merge branch '23380-no-space-between-buttons-on-files-page' into 'master'
Resolve "No space between buttons on Files page"
## What does this MR do?
Adds a `.download-button` class to the project download button and added `10px` of margin to this button within the `.tree-controls`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Whitespace is gr8!
## Screenshots (if relevant)
![Screen_Shot_2016-10-16_at_14.05.09](/uploads/2da692bd55e06c730d048ccf9173bd2c/Screen_Shot_2016-10-16_at_14.05.09.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23380
See merge request !6921
-rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 4 | ||||
-rw-r--r-- | app/views/projects/buttons/_download.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 99c0f6362d0..6ea7a2b5498 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -169,4 +169,8 @@ margin-top: 11px; position: relative; z-index: 2; + + .download-button { + margin-left: $btn-side-margin; + } } diff --git a/app/views/projects/buttons/_download.html.haml b/app/views/projects/buttons/_download.html.haml index 9089586a89d..7e83a88913a 100644 --- a/app/views/projects/buttons/_download.html.haml +++ b/app/views/projects/buttons/_download.html.haml @@ -1,5 +1,5 @@ - if !project.empty_repo? && can?(current_user, :download_code, project) - %span{class: 'hidden-xs hidden-sm'} + %span{class: 'hidden-xs hidden-sm download-button'} .dropdown.inline %button.btn{ 'data-toggle' => 'dropdown' } = icon('download') |