Commit e8d57378 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '28338-different-dropdown-styles-on-settings-page' into 'master'

Resolve "Different dropdown styles on settings page"

Closes #28338

See merge request gitlab-org/gitlab!19106
parents 1d7bcbf3 d1d8acac
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
.form-group .form-group
= f.label :auth_method, _('Authentication method'), class: 'label-bold' = f.label :auth_method, _('Authentication method'), class: 'label-bold'
= f.select :auth_method, .select-wrapper
options_for_select(auth_options, mirror.auth_method), = f.select :auth_method,
{}, { class: "form-control js-mirror-auth-type qa-authentication-method" } options_for_select(auth_options, mirror.auth_method),
= f.hidden_field :auth_method, value: "password", class: "js-hidden-mirror-auth-type" {}, { class: "form-control select-control js-mirror-auth-type qa-authentication-method" }
= icon('chevron-down')
= f.hidden_field :auth_method, value: "password", class: "js-hidden-mirror-auth-type"
.form-group .form-group
.collapse.js-well-changing-auth .collapse.js-well-changing-auth
......
.form-group .form-group
= label_tag :mirror_direction, _('Mirror direction'), class: 'label-light' = label_tag :mirror_direction, _('Mirror direction'), class: 'label-light'
= select_tag :mirror_direction, options_for_select([[_('Push'), 'push']]), class: 'form-control js-mirror-direction qa-mirror-direction', disabled: true .select-wrapper
= select_tag :mirror_direction, options_for_select([[_('Push'), 'push']]), class: 'form-control select-control js-mirror-direction qa-mirror-direction', disabled: true
= icon('chevron-down')
= render partial: "projects/mirrors/mirror_repos_push", locals: { f: f } = render partial: "projects/mirrors/mirror_repos_push", locals: { f: f }
---
title: Change selects from default browser style to custom style
merge_request:
author:
type: other
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
.form-group .form-group
= label_tag :mirror_direction, _('Mirror direction'), class: 'label-light' = label_tag :mirror_direction, _('Mirror direction'), class: 'label-light'
= select_tag :mirror_direction, options_for_select(direction_options), class: 'form-control js-mirror-direction qa-mirror-direction', disabled: (direction_options.count == 1) || has_existing_pull_mirror .select-wrapper
= select_tag :mirror_direction, options_for_select(direction_options), class: 'form-control select-control js-mirror-direction qa-mirror-direction', disabled: (direction_options.count == 1) || has_existing_pull_mirror
= icon('chevron-down')
.js-form-insertion-point .js-form-insertion-point
......
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