Merge branch 'issue_14643' into 'master'

Fix background when editing a highlighted note Fixes #14643 See merge request !3423

Merge branch 'issue_14643' into 'master'
Fix background when editing a highlighted note Fixes #14643 See merge request !3423
e7f93e2b · Robert Speicher · Rémy Coutable · 7d72f550 · e7f93e2b · e7f93e2b
Commit e7f93e2b authored Mar 28, 2016 by Robert Speicher Committed by Rémy Coutable Mar 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

CHANGELOG CHANGELOG +1 -0

app/assets/stylesheets/pages/note_form.scss app/assets/stylesheets/pages/note_form.scss +0 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.6.2
  - Add links to CI setup documentation from project settings and builds pages. !3384
  - Fix an issue with width of project select dropdown. !3386
  - Fix error 500 with cancel button on issuable edit form. !3392
+  - Fix background when editing a highlighted note. !3423

 v 8.6.2 (unreleased)
  - Comments on confidential issues don't show up in activity feed to non-members

--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -71,8 +71,6 @@
 }

 .note-form-actions {
-  background: #fff;
-
  .note-form-option {
    margin-top: 8px;
    margin-left: 30px;