Commit 8a263f52 authored by Annabel Gray's avatar Annabel Gray

Merge branch 'ee-bootstrap-help-block' into 'master'

Replace help-block with form-text.text-muted (EE)

Closes gitlab-ce#46745

See merge request gitlab-org/gitlab-ee!5884
parents 8694bbd4 d82cbe7a
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
</ul> </ul>
<p <p
v-else v-else
class="multi-file-commit-list help-block" class="multi-file-commit-list form-text text-muted"
> >
{{ __('No changes') }} {{ __('No changes') }}
</p> </p>
......
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
margin-right: 0; margin-right: 0;
} }
&.help-block { &.form-text.text-muted {
margin-left: 0; margin-left: 0;
right: 0; right: 0;
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= f.label :mirror_available do = f.label :mirror_available do
= f.check_box :mirror_available = f.check_box :mirror_available
Allow mirrors to be setup for projects Allow mirrors to be setup for projects
%span.help-block %span.form-text.text-muted
If disabled, only admins will be able to setup mirrors in projects. If disabled, only admins will be able to setup mirrors in projects.
= link_to icon('question-circle'), help_page_path('workflow/repository_mirroring') = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= f.label :enforce_terms do = f.label :enforce_terms do
= f.check_box :enforce_terms = f.check_box :enforce_terms
= _("Require all users to accept Terms of Service when they access GitLab.") = _("Require all users to accept Terms of Service when they access GitLab.")
.help-block .form-text.text-muted
= _("When enabled, users cannot use GitLab until the terms have been accepted.") = _("When enabled, users cannot use GitLab until the terms have been accepted.")
.form-group .form-group
.col-sm-12 .col-sm-12
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= _("Terms of Service Agreement") = _("Terms of Service Agreement")
.col-sm-12 .col-sm-12
= f.text_area :terms, class: 'form-control', rows: 8 = f.text_area :terms, class: 'form-control', rows: 8
.help-block .form-text.text-muted
= _("Markdown enabled") = _("Markdown enabled")
= f.submit _("Save changes"), class: "btn btn-success" = f.submit _("Save changes"), class: "btn btn-success"
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
Maximum delay (Minutes) Maximum delay (Minutes)
.col-sm-10 .col-sm-10
= f.number_field :mirror_max_delay, class: 'form-control', min: 0 = f.number_field :mirror_max_delay, class: 'form-control', min: 0
%span.help-block#mirror_max_delay_help_block %span.form-text.text-muted#mirror_max_delay_help_block
Maximum time between updates that a mirror can have when scheduled to synchronize. Maximum time between updates that a mirror can have when scheduled to synchronize.
.form-group .form-group
= f.label :mirror_max_capacity, class: 'control-label col-sm-2' do = f.label :mirror_max_capacity, class: 'control-label col-sm-2' do
Maximum capacity Maximum capacity
.col-sm-10 .col-sm-10
= f.number_field :mirror_max_capacity, class: 'form-control', min: 0 = f.number_field :mirror_max_capacity, class: 'form-control', min: 0
%span.help-block#mirror_max_capacity_help_block %span.form-text.text-muted#mirror_max_capacity_help_block
Maximum number of mirrors that can be synchronizing at the same time. Maximum number of mirrors that can be synchronizing at the same time.
.form-group .form-group
= f.label :mirror_capacity_threshold, class: 'control-label col-sm-2' do = f.label :mirror_capacity_threshold, class: 'control-label col-sm-2' do
Capacity threshold Capacity threshold
.col-sm-10 .col-sm-10
= f.number_field :mirror_capacity_threshold, class: 'form-control', min: 0 = f.number_field :mirror_capacity_threshold, class: 'form-control', min: 0
%span.help-block#mirror_capacity_threshold %span.form-text.text-muted#mirror_capacity_threshold
Minimum capacity to be available before we schedule more mirrors preemptively. Minimum capacity to be available before we schedule more mirrors preemptively.
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