kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '24820-buttons-in-the-branches-page-are-stacking-on-top-of-each-other-depending-on-the-selected-filter' into 'master'

Browse source 
Resolve "Buttons in the "Branches" page are stacking on top of each other depending on the selected filter"

Closes #24820

See merge request !8074
This commit is contained in:
Alfredo Sumaran 2016-12-28 22:19:21 +00:00
commit 104b7b6c39
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/framework/nav.scss
View file

@ -256,6 +256,10 @@
.nav-text, .nav-text,
.nav-controls { .nav-controls {
width: auto; width: auto;
@media (max-width: $screen-xs-max) {
width: 100%;
}
} }
} }

4
app/views/projects/branches/index.html.haml
View file

@ -3,7 +3,7 @@
= render "projects/commits/head" = render "projects/commits/head"
%div{ class: container_class } %div{ class: container_class }
.top-area .top-area.adjust
.nav-text .nav-text
Protected branches can be managed in project settings Protected branches can be managed in project settings
@ -12,7 +12,7 @@
= search_field_tag :search, params[:search], { placeholder: 'Filter by branch name', id: 'branch-search', class: 'form-control search-text-input input-short', spellcheck: false } = 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-toggle{type: 'button', 'data-toggle' => 'dropdown'} %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
%span.light %span.light
= projects_sort_options_hash[@sort] = projects_sort_options_hash[@sort]
= icon('chevron-down') = icon('chevron-down')

4
changelogs/unreleased/24820-buttons-in-the-branches-page-are-stacking-on-top-of-each-other-depending-on-the-selected-filter.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: fix button layout issue on branches page
merge_request: 8074
author: