Commit 9b469c20 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'yo-gl-input-admin-users' into 'master'

Apply new GitLab UI for inputs in admin/users directory

See merge request gitlab-org/gitlab!52290
parents 670a89cd 2a34fdaa
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :projects_limit = f.label :projects_limit
.col-sm-10 .col-sm-10
= f.number_field :projects_limit, min: 0, max: Gitlab::Database::MAX_INT_VALUE, class: 'form-control' = f.number_field :projects_limit, min: 0, max: Gitlab::Database::MAX_INT_VALUE, class: 'form-control gl-form-input'
.form-group.row .form-group.row
.col-sm-2.col-form-label.gl-pt-0 .col-sm-2.col-form-label.gl-pt-0
......
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :note, s_('AdminNote|Note') = f.label :note, s_('AdminNote|Note')
.col-sm-10 .col-sm-10
= f.text_area :note, class: 'form-control' = f.text_area :note, class: 'form-control gl-form-input gl-form-textarea'
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :name = f.label :name
.col-sm-10 .col-sm-10
= f.text_field :name, required: true, autocomplete: 'off', class: 'form-control' = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control gl-form-input'
%span.help-inline * required %span.help-inline * required
.form-group.row .form-group.row
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :username = f.label :username
.col-sm-10 .col-sm-10
= f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control' = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control gl-form-input'
%span.help-inline * required %span.help-inline * required
.form-group.row .form-group.row
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :email = f.label :email
.col-sm-10 .col-sm-10
= f.text_field :email, required: true, autocomplete: 'off', class: 'form-control' = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control gl-form-input'
%span.help-inline * required %span.help-inline * required
- if @user.new_record? - if @user.new_record?
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :password = f.label :password
.col-sm-10 .col-sm-10
= f.password_field :password, disabled: f.object.force_random_password, class: 'form-control' = f.password_field :password, disabled: f.object.force_random_password, class: 'form-control gl-form-input'
.form-group.row .form-group.row
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :password_confirmation = f.label :password_confirmation
.col-sm-10 .col-sm-10
= f.password_field :password_confirmation, disabled: f.object.force_random_password, class: 'form-control' = f.password_field :password_confirmation, disabled: f.object.force_random_password, class: 'form-control gl-form-input'
= render partial: 'access_levels', locals: { f: f } = render partial: 'access_levels', locals: { f: f }
...@@ -66,22 +66,22 @@ ...@@ -66,22 +66,22 @@
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :skype = f.label :skype
.col-sm-10 .col-sm-10
= f.text_field :skype, class: 'form-control' = f.text_field :skype, class: 'form-control gl-form-input'
.form-group.row .form-group.row
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :linkedin = f.label :linkedin
.col-sm-10 .col-sm-10
= f.text_field :linkedin, class: 'form-control' = f.text_field :linkedin, class: 'form-control gl-form-input'
.form-group.row .form-group.row
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :twitter = f.label :twitter
.col-sm-10 .col-sm-10
= f.text_field :twitter, class: 'form-control' = f.text_field :twitter, class: 'form-control gl-form-input'
.form-group.row .form-group.row
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :website_url = f.label :website_url
.col-sm-10 .col-sm-10
= f.text_field :website_url, class: 'form-control' = f.text_field :website_url, class: 'form-control gl-form-input'
= render 'admin/users/admin_notes', f: f = render 'admin/users/admin_notes', f: f
......
---
title: Apply new GitLab UI for inputs in admin/users directory
merge_request: 52290
author: Yogi (@yo)
type: other
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