diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-25 22:37:14 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-25 22:37:14 +0000 |
| commit | bfa92ff29c07fec606c99f5aec5f827be952e465 (patch) | |
| tree | ae2c7ac4d228d1a6aebb6d18e89b597dc596d8c3 | |
| parent | 06fca50687bd5d7071957ad8bbf396b212dd98f9 (diff) | |
| parent | c8a17cdb6eaa5c207ea710c5da42131602aa6a3e (diff) | |
| download | gitlab-ce-bfa92ff29c07fec606c99f5aec5f827be952e465.tar.gz | |
Merge branch '24895-branch-index-delete-button-inconsistently-spaced-and-misaligned' into 'master'
Resolve "Branch index delete button inconsistently spaced and misaligned"
Closes #24895
See merge request !8646
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 3 | ||||
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/branches/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/buttons/_download.html.haml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 1c6698ad0c6..426596027de 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -155,7 +155,8 @@ ul.content-list { } > .btn, - > .btn-group { + > .btn-group, + > .dropdown.inline { margin-right: $gl-padding-top; display: inline-block; margin-top: 3px; diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 04efc2e996c..19ffe73a08d 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -18,7 +18,7 @@ - if @project.protected_branch? branch.name %span.label.label-success protected - .controls.hidden-xs + .controls.hidden-xs< - if merge_project && create_mr_button?(@repository.root_ref, branch.name) = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do Merge Request diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 5f8f56150f9..bd1f2d96f56 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -12,7 +12,7 @@ = form_tag(filter_branches_path, method: :get) do = search_field_tag :search, params[:search], { placeholder: 'Filter by branch name', id: 'branch-search', class: 'form-control search-text-input input-short', spellcheck: false } - .dropdown.inline + .dropdown.inline> %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' } %span.light = projects_sort_options_hash[@sort] diff --git a/app/views/projects/buttons/_download.html.haml b/app/views/projects/buttons/_download.html.haml index 324a7f8cd3f..762ff34a9ec 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) - .project-action-button.dropdown.inline + .project-action-button.dropdown.inline> %button.btn{ 'data-toggle' => 'dropdown' } = icon('download') = icon("caret-down") |