Commit 087ea003 authored by Eric Eastwood's avatar Eric Eastwood

Fix new branch dropdown position and size

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32096
parent 1ccf101e
...@@ -17,11 +17,13 @@ ...@@ -17,11 +17,13 @@
.help-block.text-danger.js-branch-name-error .help-block.text-danger.js-branch-name-error
.form-group .form-group
= label_tag :ref, 'Create from', class: 'control-label' = label_tag :ref, 'Create from', class: 'control-label'
.col-sm-10.dropdown.create-from .col-sm-10.create-from
= hidden_field_tag :ref, default_ref .dropdown
= button_tag type: 'button', title: default_ref, class: 'dropdown-toggle form-control js-branch-select', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do = hidden_field_tag :ref, default_ref
.text-left.dropdown-toggle-text= default_ref = button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide form-control js-branch-select', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
= render 'shared/ref_dropdown', dropdown_class: 'wide' .text-left.dropdown-toggle-text= default_ref
= icon('chevron-down')
= render 'shared/ref_dropdown', dropdown_class: 'wide'
.help-block Existing branch name, tag, or commit SHA .help-block Existing branch name, tag, or commit SHA
.form-actions .form-actions
= button_tag 'Create branch', class: 'btn btn-create', tabindex: 3 = button_tag 'Create branch', class: 'btn btn-create', tabindex: 3
......
...@@ -3,7 +3,7 @@ require 'spec_helper' ...@@ -3,7 +3,7 @@ require 'spec_helper'
describe 'New Branch Ref Dropdown', :js, :feature do describe 'New Branch Ref Dropdown', :js, :feature do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project, :public) } let(:project) { create(:project, :public) }
let(:toggle) { find('.create-from .dropdown-toggle') } let(:toggle) { find('.create-from .dropdown-menu-toggle') }
before do before do
project.add_master(user) project.add_master(user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment