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 21:26:37 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-04-11 21:26:37 +0300
commit673b0461b055b937ed25a43071bf3d1d7282244a (patch)
treea3b1d21366da4eddf58813e18bba767cebc7e6cf /app/assets
parent763e14c38d4afce3a82b21ea40ce630185de1132 (diff)
[skip ci] .help-block to .form-text.text-muted
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/behaviors/requires_input.js4
-rw-r--r--app/assets/javascripts/visibility_select.js2
-rw-r--r--app/assets/stylesheets/framework/forms.scss2
-rw-r--r--app/assets/stylesheets/pages/projects.scss2
-rw-r--r--app/assets/stylesheets/pages/repo.scss2
-rw-r--r--app/assets/stylesheets/pages/repo.scss.orig2
-rw-r--r--app/assets/stylesheets/pages/settings.scss2
7 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/behaviors/requires_input.js b/app/assets/javascripts/behaviors/requires_input.js
index ffff4ddb71a..a8b6dbf0948 100644
--- a/app/assets/javascripts/behaviors/requires_input.js
+++ b/app/assets/javascripts/behaviors/requires_input.js
@@ -42,9 +42,9 @@ $.fn.requiresInput = function requiresInput() {
function hideOrShowHelpBlock(form) {
const selected = $('.js-select-namespace option:selected');
if (selected.length && selected.data('optionsParent') === 'groups') {
- form.find('.help-block').hide();
+ form.find('.form-text.text-muted').hide();
} else if (selected.length) {
- form.find('.help-block').show();
+ form.find('.form-text.text-muted').show();
}
}
diff --git a/app/assets/javascripts/visibility_select.js b/app/assets/javascripts/visibility_select.js
index 0c928d0d5f6..0b1d77d7a91 100644
--- a/app/assets/javascripts/visibility_select.js
+++ b/app/assets/javascripts/visibility_select.js
@@ -2,7 +2,7 @@ export default class VisibilitySelect {
constructor(container) {
if (!container) throw new Error('VisibilitySelect requires a container element as argument 1');
this.container = container;
- this.helpBlock = this.container.querySelector('.help-block');
+ this.helpBlock = this.container.querySelector('.form-text.text-muted');
this.select = this.container.querySelector('select');
}
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 17e13ecc779..eb635361f3a 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -180,7 +180,7 @@ label {
}
}
-.help-block {
+.form-text.text-muted {
margin-bottom: 0;
margin-top: #{$grid-size / 2};
}
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 456a5779559..9395140cf4a 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -9,7 +9,7 @@
.new_project,
.edit-project,
.import-project {
- .help-block {
+ .form-text.text-muted {
margin-bottom: 10px;
}
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index a414deb8921..7427036e928 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -816,7 +816,7 @@
font-weight: normal;
}
- .help-block {
+ .form-text.text-muted {
margin-top: 0;
line-height: 0;
}
diff --git a/app/assets/stylesheets/pages/repo.scss.orig b/app/assets/stylesheets/pages/repo.scss.orig
index 57b995adb64..0bf29c7fe2f 100644
--- a/app/assets/stylesheets/pages/repo.scss.orig
+++ b/app/assets/stylesheets/pages/repo.scss.orig
@@ -749,7 +749,7 @@
font-weight: normal;
}
- .help-block {
+ .form-text.text-muted {
margin-top: 0;
line-height: 0;
}
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index fa495c9ecf0..212fe0f6dcc 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -99,7 +99,7 @@
.bs-callout,
.form-check:first-child,
- .help-block {
+ .form-text.text-muted {
margin-top: 0;
}