summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-10-17 20:47:27 +0000
committerJan Provaznik <jprovaznik@gitlab.com>2018-10-18 13:54:40 +0200
commita93be5cd1386995a65929a4e7510cee9b4621899 (patch)
tree05e896be63e951f6ba9812499f5104277df56c32
parent74e1b0551f8cab09d613938add6c9f7af4695e61 (diff)
downloadgitlab-ce-a93be5cd1386995a65929a4e7510cee9b4621899.tar.gz
Merge branch '7944-fix-resolve-checkbox-text-color' into 'master'
Fix color of text in resolution checkbox Closes #7944 See merge request gitlab-org/gitlab-ee!7975
-rw-r--r--app/assets/stylesheets/pages/note_form.scss2
-rw-r--r--ee/changelogs/unreleased/7944-fix-resolve-checkbox-text-color.yml5
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 4268e194ed7..c60bb360a03 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -340,6 +340,8 @@
}
.note-form-actions {
+ color: $gl-text-color;
+
@include media-breakpoint-down(xs) {
.btn {
float: none;
diff --git a/ee/changelogs/unreleased/7944-fix-resolve-checkbox-text-color.yml b/ee/changelogs/unreleased/7944-fix-resolve-checkbox-text-color.yml
new file mode 100644
index 00000000000..9d8b06f4901
--- /dev/null
+++ b/ee/changelogs/unreleased/7944-fix-resolve-checkbox-text-color.yml
@@ -0,0 +1,5 @@
+---
+title: Fix wrong color in resolve/unresolve checkbox when using MR reviews
+merge_request:
+author:
+type: fixed