Commit 673a45a1 authored by Annabel Gray's avatar Annabel Gray

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

Replace help-block with form-text.text-muted

Closes #46745

See merge request gitlab-org/gitlab-ce!19206
parents c189246d 425fdd79
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
@input="debouncedPreview" @input="debouncedPreview"
/> />
<span <span
class="help-block" class="form-text text-muted"
v-html="helpText" v-html="helpText"
></span> ></span>
</div> </div>
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
@input="debouncedPreview" @input="debouncedPreview"
/> />
<span <span
class="help-block" class="form-text text-muted"
v-html="helpText" v-html="helpText"
></span> ></span>
</div> </div>
......
...@@ -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>
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
{{ __('Commit Message') }} {{ __('Commit Message') }}
<span <span
v-popover="$options.popoverOptions" v-popover="$options.popoverOptions"
class="help-block prepend-left-10" class="form-text text-muted prepend-left-10"
> >
<icon <icon
name="question" name="question"
......
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
</i> </i>
</div> </div>
</div> </div>
<span class="help-block">{{ visibilityLevelDescription }}</span> <span class="form-text text-muted">{{ visibilityLevelDescription }}</span>
<label <label
v-if="visibilityLevel !== visibilityOptions.PRIVATE" v-if="visibilityLevel !== visibilityOptions.PRIVATE"
class="request-access" class="request-access"
......
...@@ -99,7 +99,7 @@ Please update your Git repository remotes as soon as possible.`), ...@@ -99,7 +99,7 @@ Please update your Git repository remotes as soon as possible.`),
:disabled="isRequestPending" :disabled="isRequestPending"
/> />
</div> </div>
<p class="help-block"> <p class="form-text text-muted">
{{ path }} {{ path }}
</p> </p>
</div> </div>
......
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
</div> </div>
</div> </div>
<span <span
class="help-block" class="form-text text-muted"
:class="{ 'gl-field-error': hasErrors }" :class="{ 'gl-field-error': hasErrors }"
v-if="hasErrors" v-if="hasErrors"
> >
......
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
</div> </div>
</div> </div>
<span <span
class="help-block" class="form-text text-muted"
:class="{ 'gl-field-error': hasErrors }" :class="{ 'gl-field-error': hasErrors }"
v-html="helpText" v-html="helpText"
></span> ></span>
......
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
</div> </div>
</div> </div>
<span <span
class="help-block" class="form-text text-muted"
:class="{ 'gl-field-error': hasErrors }" :class="{ 'gl-field-error': hasErrors }"
v-if="hasErrors" v-if="hasErrors"
> >
......
...@@ -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;
} }
...@@ -952,7 +952,7 @@ ...@@ -952,7 +952,7 @@
height: 30px; height: 30px;
} }
.help-block { .form-text.text-muted {
margin-top: 2px; margin-top: 2px;
color: $blue-500; color: $blue-500;
cursor: pointer; cursor: pointer;
......
...@@ -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"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%span.dropdown-toggle-text %span.dropdown-toggle-text
= _('Select project') = _('Select project')
= icon('chevron-down') = icon('chevron-down')
%span.help-block &nbsp; %span.form-text.text-muted &nbsp;
.form-group .form-group
= provider_gcp_field.label :zone, s_('ClusterIntegration|Zone') = provider_gcp_field.label :zone, s_('ClusterIntegration|Zone')
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
= form.label :domain, class:"prepend-top-10" do = form.label :domain, class:"prepend-top-10" do
= _('Domain') = _('Domain')
= form.text_field :domain, class: 'form-control', placeholder: 'domain.com' = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
.help-block .form-text.text-muted
= s_('CICD|A domain is required to use Auto Review Apps and Auto Deploy Stages.') = s_('CICD|A domain is required to use Auto Review Apps and Auto Deploy Stages.')
- if cluster_ingress_ip = cluster_ingress_ip(@project) - if cluster_ingress_ip = cluster_ingress_ip(@project)
= s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe } = s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe }
......
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