summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/create_merge_request_dropdown.js
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-19 21:22:31 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-06-19 21:22:31 +0000
commit3e3f527991eb53e91a618d6fa806b93617bbc68d (patch)
treee898c389f8a89d59d309e91bd84c12491b78ea6b /app/assets/javascripts/create_merge_request_dropdown.js
parente0da61bca80485b99f78ef1dbb3c64578d64d55a (diff)
downloadgitlab-ce-3e3f527991eb53e91a618d6fa806b93617bbc68d.tar.gz
Resolve "Branch name status color is not correct anymore"
Diffstat (limited to 'app/assets/javascripts/create_merge_request_dropdown.js')
-rw-r--r--app/assets/javascripts/create_merge_request_dropdown.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js
index 108082799ef..f77a5730b77 100644
--- a/app/assets/javascripts/create_merge_request_dropdown.js
+++ b/app/assets/javascripts/create_merge_request_dropdown.js
@@ -366,7 +366,7 @@ export default class CreateMergeRequestDropdown {
removeMessage(target) {
const { input, message } = this.getTargetData(target);
const inputClasses = ['gl-field-error-outline', 'gl-field-success-outline'];
- const messageClasses = ['gl-field-hint', 'gl-field-error-message', 'gl-field-success-message'];
+ const messageClasses = ['text-muted', 'text-danger', 'text-success'];
inputClasses.forEach(cssClass => input.classList.remove(cssClass));
messageClasses.forEach(cssClass => message.classList.remove(cssClass));
@@ -393,7 +393,7 @@ export default class CreateMergeRequestDropdown {
this.removeMessage(target);
input.classList.add('gl-field-success-outline');
- message.classList.add('gl-field-success-message');
+ message.classList.add('text-success');
message.textContent = sprintf(__('%{text} is available'), { text });
message.style.display = 'inline-block';
}
@@ -403,7 +403,7 @@ export default class CreateMergeRequestDropdown {
const text = target === 'branch' ? __('branch name') : __('source');
this.removeMessage(target);
- message.classList.add('gl-field-hint');
+ message.classList.add('text-muted');
message.textContent = sprintf(__('Checking %{text} availability…'), { text });
message.style.display = 'inline-block';
}
@@ -415,7 +415,7 @@ export default class CreateMergeRequestDropdown {
this.removeMessage(target);
input.classList.add('gl-field-error-outline');
- message.classList.add('gl-field-error-message');
+ message.classList.add('text-danger');
message.textContent = text;
message.style.display = 'inline-block';
}