diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index 169d38ab5aabe954863b96fe9485914387babb05..d7a5e21e303746fec9c9538ded2245e579e96d05 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -253,11 +253,6 @@ $gl-line-height-42: px-to-rem(42px); max-width: 50%; } -// Will be moved to @gitlab/ui in https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2894 -.gl-form-lg { - max-width: 320px; -} - /** Note: ::-webkit-scrollbar is a non-standard rule only supported by webkit browsers. diff --git a/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml b/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml index 13603c8f94699828e03d71722d11f47c02a0b3dd..a3addfb9b1a75adfad4b70ad5f63854068f69b28 100644 --- a/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml +++ b/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml @@ -8,7 +8,7 @@ .form-group.row = f.label :name, s_('ProtectedBranch|Branch:'), class: 'col-sm-12' .col-sm-12 - = render partial: "projects/protected_branches/shared/dropdown", locals: { f: f, toggle_classes: 'gl-w-full! gl-form-lg' } + = render partial: "projects/protected_branches/shared/dropdown", locals: { f: f, toggle_classes: 'gl-w-full! gl-form-input-lg' } .form-text.text-muted - wildcards_url = help_page_url('user/project/protected_branches', anchor: 'configure-multiple-protected-branches-by-using-a-wildcard') - wildcards_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: wildcards_url } diff --git a/ee/app/views/projects/protected_branches/ee/_create_protected_branch.html.haml b/ee/app/views/projects/protected_branches/ee/_create_protected_branch.html.haml index c4eb337771d9f9c678801aafd7e0dfd6f919c3c7..9b95a754d2ea0941c97bb6a574f9aeb503c33460 100644 --- a/ee/app/views/projects/protected_branches/ee/_create_protected_branch.html.haml +++ b/ee/app/views/projects/protected_branches/ee/_create_protected_branch.html.haml @@ -1,13 +1,13 @@ - content_for :merge_access_levels do .merge_access_levels-container = dropdown_tag('Select', - options: { toggle_class: 'js-allowed-to-merge qa-allowed-to-merge-select js-multiselect gl-w-full! gl-form-lg', + options: { toggle_class: 'js-allowed-to-merge qa-allowed-to-merge-select js-multiselect gl-w-full! gl-form-input-lg', dropdown_class: 'dropdown-menu-user dropdown-menu-selectable qa-allowed-to-merge-dropdown capitalize-header', filter: true, data: { input_id: 'merge_access_levels_attributes', default_label: 'Select' } }) - content_for :push_access_levels do .push_access_levels-container = dropdown_tag('Select', - options: { toggle_class: 'js-allowed-to-push qa-allowed-to-push-select js-multiselect gl-w-full! gl-form-lg', + options: { toggle_class: 'js-allowed-to-push qa-allowed-to-push-select js-multiselect gl-w-full! gl-form-input-lg', dropdown_class: 'dropdown-menu-user dropdown-menu-selectable qa-allowed-to-push-dropdown capitalize-header', filter: true, data: { input_id: 'push_access_levels_attributes', default_label: 'Select' } }) .form-text.text-muted