Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-11 22:36:17 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-04-11 22:36:17 +0300
commite44ceb96d0875ffbe2959cd17a87f02b2b815547 (patch)
treee464e0454bb72c2cba1d63a7d2ffa3b5e3eeac4b /app/views/groups
parent94a051cf5489061460b6ffa70a232e5e7cbb1eba (diff)
[skip ci] .control-label to .col-form-label
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/_create_chat_team.html.haml2
-rw-r--r--app/views/groups/_group_admin_settings.html.haml4
-rw-r--r--app/views/groups/edit.html.haml2
-rw-r--r--app/views/groups/milestones/_form.html.haml4
-rw-r--r--app/views/groups/new.html.haml2
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/groups/_create_chat_team.html.haml b/app/views/groups/_create_chat_team.html.haml
index 28bc9e2f299..9a3ff0313b5 100644
--- a/app/views/groups/_create_chat_team.html.haml
+++ b/app/views/groups/_create_chat_team.html.haml
@@ -1,5 +1,5 @@
.form-group
- = f.label :create_chat_team, class: 'control-label' do
+ = f.label :create_chat_team, class: 'col-form-label' do
%span.mattermost-icon
= custom_icon('icon_mattermost')
Mattermost
diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml
index a20767aeab3..d7efbf33eb4 100644
--- a/app/views/groups/_group_admin_settings.html.haml
+++ b/app/views/groups/_group_admin_settings.html.haml
@@ -1,6 +1,6 @@
- if current_user.admin?
.form-group
- = f.label :lfs_enabled, 'Large File Storage', class: 'control-label'
+ = f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label'
.col-sm-10
.form-check
= f.label :lfs_enabled do
@@ -13,7 +13,7 @@
- if can? current_user, :admin_group, @group
.form-group
- = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
+ = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
.col-sm-10
.form-check
= f.label :require_two_factor_authentication do
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 92d27c00b92..a508e4ccbc2 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -28,7 +28,7 @@
= render 'shared/allow_request_access', form: f
.form-group
- %label.control-label
+ %label.col-form-label
= s_("GroupSettings|Share with group lock")
.col-sm-10
.form-check
diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml
index a1be0d3220a..8d30cf95e3f 100644
--- a/app/views/groups/milestones/_form.html.haml
+++ b/app/views/groups/milestones/_form.html.haml
@@ -4,11 +4,11 @@
.col-md-6
.form-group
- = f.label :title, "Title", class: "control-label"
+ = f.label :title, "Title", class: "col-form-label"
.col-sm-10
= f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
.form-group.milestone-description
- = f.label :description, "Description", class: "control-label"
+ = f.label :description, "Description", class: "col-form-label"
.col-sm-10
= render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do
= render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...', supports_autocomplete: false
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index e9daac95ca1..9b9a16a2fd5 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -13,7 +13,7 @@
= render 'shared/group_form', f: f, autofocus: true
.form-group.group-description-holder
- = f.label :avatar, "Group avatar", class: 'control-label'
+ = f.label :avatar, "Group avatar", class: 'col-form-label'
.col-sm-10
= render 'shared/choose_group_avatar_button', f: f