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

Merge branch '23380-no-space-between-buttons-on-files-page' into 'master'
b2251810 · Fatih Acet · d4feb781 · 6aca8b57 · b2251810 · b2251810
Commit b2251810 authored Oct 17, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

tree.scss app/assets/stylesheets/pages/tree.scss +4 -0

_download.html.haml app/views/projects/buttons/_download.html.haml +1 -1

No files found.
--- 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;
+  }
 }
--- a/app/views/projects/buttons/_download.html.haml
+++ b/app/views/projects/buttons/_download.html.haml
 - 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')