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
This commit is contained in:
Annabel Dunstone Gray 2017-01-25 22:37:14 +00:00
commit bfa92ff29c
4 changed files with 5 additions and 4 deletions

View file

@ -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;

View file

@ -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

View file

@ -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]

View file

@ -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")