diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-28 20:23:18 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-29 12:29:41 +0200 |
| commit | e7f93e2b2506d2f2466b45f93cef94449a2893c3 (patch) | |
| tree | dffdd99aa8634a2a673ac0a3e6c5acd4616b2844 | |
| parent | 7d72f55099fd8856cb25f18230409a4778f4b90a (diff) | |
| download | gitlab-ce-e7f93e2b2506d2f2466b45f93cef94449a2893c3.tar.gz | |
Merge branch 'issue_14643' into 'master'
Fix background when editing a highlighted note
Fixes #14643
See merge request !3423
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index c4acec4f755..e7193650bdd 100644 --- 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 diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index daf2651425f..655f88b0c2c 100644 --- 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; |