Commit 643fe43d authored by Phil Hughes's avatar Phil Hughes

Addressed feedback

Removed important from css
parent 1ca627f7
...@@ -61,7 +61,7 @@ class GitLabDropdownFilter ...@@ -61,7 +61,7 @@ class GitLabDropdownFilter
if data? if data?
results = data results = data
if search_text isnt "" if search_text isnt ''
results = fuzzaldrinPlus.filter(data, search_text, results = fuzzaldrinPlus.filter(data, search_text,
key: @options.keys key: @options.keys
) )
...@@ -139,7 +139,7 @@ class GitLabDropdown ...@@ -139,7 +139,7 @@ class GitLabDropdown
if _.isString(@filterInput) if _.isString(@filterInput)
@filterInput = @getElement(@filterInput) @filterInput = @getElement(@filterInput)
search_fields = if @options.search then @options.search.fields else []; searchFields = if @options.search then @options.search.fields else [];
if @options.data if @options.data
# If data is an array # If data is an array
...@@ -163,11 +163,11 @@ class GitLabDropdown ...@@ -163,11 +163,11 @@ class GitLabDropdown
filterInputBlur: @filterInputBlur filterInputBlur: @filterInputBlur
remote: @options.filterRemote remote: @options.filterRemote
query: @options.data query: @options.data
keys: search_fields keys: searchFields
elements: => elements: =>
selector = ".dropdown-content li:not(.divider)" selector = '.dropdown-content li:not(.divider)'
if @dropdown.find(".dropdown-toggle-page").length if @dropdown.find('.dropdown-toggle-page').length
selector = ".dropdown-page-one #{selector}" selector = ".dropdown-page-one #{selector}"
return $(selector) return $(selector)
......
...@@ -258,6 +258,7 @@ ...@@ -258,6 +258,7 @@
} }
} }
.merge-request-form .select2-container { .issuable-form-select-holder {
width: 250px!important; display: inline-block;
width: 250px;
} }
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
= dropdown_title("Select source project") = dropdown_title("Select source project")
= dropdown_filter("Search projects") = dropdown_filter("Search projects")
= dropdown_content do = dropdown_content do
- is_active = f.object.source_project_id == @merge_request.source_project.id
%ul %ul
%li %li
%a{ href: "#", class: "#{("is-active" if f.object.source_project_id == @merge_request.source_project.id)}", data: { id: @merge_request.source_project.id } } %a{ href: "#", class: "#{("is-active" if is_active)}", data: { id: @merge_request.source_project.id } }
= @merge_request.source_project_path = @merge_request.source_project_path
.merge-request-select.dropdown .merge-request-select.dropdown
= f.hidden_field :source_branch = f.hidden_field :source_branch
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
%a{ href: "#", class: "#{("is-active" if f.object.source_branch == branch)}", data: { id: branch } } %a{ href: "#", class: "#{("is-active" if f.object.source_branch == branch)}", data: { id: branch } }
= branch = branch
.panel-footer .panel-footer
= icon('spinner spin', class: "js-source-loading") = icon('spinner spin', class: 'js-source-loading')
%ul.list-unstyled.mr_source_commit %ul.list-unstyled.mr_source_commit
.col-md-6 .col-md-6
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
.issue-assignee .issue-assignee
= f.label :assignee_id, "Assignee", class: 'control-label' = f.label :assignee_id, "Assignee", class: 'control-label'
.col-sm-10 .col-sm-10
.issuable-form-select-holder
= users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]", = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
placeholder: 'Select assignee', class: 'custom-form-control', null_user: true, placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
selected: issuable.assignee_id, project: @target_project || @project, selected: issuable.assignee_id, project: @target_project || @project,
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
= f.label :milestone_id, "Milestone", class: 'control-label' = f.label :milestone_id, "Milestone", class: 'control-label'
.col-sm-10 .col-sm-10
- if milestone_options(issuable).present? - if milestone_options(issuable).present?
.issuable-form-select-holder
= f.select(:milestone_id, milestone_options(issuable), = f.select(:milestone_id, milestone_options(issuable),
{ include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } }) { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
- else - else
......
...@@ -219,7 +219,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps ...@@ -219,7 +219,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
step 'I see Browse code link' do step 'I see Browse code link' do
expect(page).to have_link 'Browse Files' expect(page).to have_link 'Browse Files'
# expect(page).not_to have_link 'Browse File'
expect(page).not_to have_link 'Browse Directory »' expect(page).not_to have_link 'Browse Directory »'
end end
......
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