Merge branch 'system-notes-broken-css' into 'master'

Fix broken CSS for system notes See merge request gitlab-org/gitlab!34870

Merge branch 'system-notes-broken-css' into 'master'
Fix broken CSS for system notes See merge request gitlab-org/gitlab!34870
d9a1e681 · Jose Ivan Vargas · 97e22f10 · 1ec43850 · d9a1e681 · d9a1e681
Commit d9a1e681 authored Jun 23, 2020 by Jose Ivan Vargas
3 changed files
--- a/app/assets/stylesheets/pages/alert_management/details.scss
+++ b/app/assets/stylesheets/pages/alert_management/details.scss
@@ -68,6 +68,6 @@
  }
  .note-header-info {
-    margin-top: 1px;
+    @include gl-mt-1;
  }
 }
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -10,6 +10,7 @@ $note-form-margin-left: 72px;
    top: 0;
    bottom: 0;
    left: $left;
+    height: calc(100% - 20px);
  }
 }

--- a/changelogs/unreleased/system-notes-broken-css.yml
+++ b/changelogs/unreleased/system-notes-broken-css.yml
+---
+title: Fix broken CSS for system notes
+merge_request: 34870
+author:
+type: other