Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/app/assets/stylesheets/notify.scss b/app/assets/stylesheets/notify.scss
index d281f62c370..feb4ea77e58 100644
--- a/app/assets/stylesheets/notify.scss
+++ b/app/assets/stylesheets/notify.scss
@@ -1,3 +1,4 @@
+@import 'framework/mixins';
 @import 'framework/variables';
 
 img {
@@ -38,3 +39,14 @@ pre.commit-message {
 .gl-label-text-dark {
   color: $gl-text-color;
 }
+
+.content {
+  .markdown-code-block pre.code {
+    padding: $gl-padding-8 $input-horizontal-padding;
+    margin: 0 0 $gl-padding-8;
+    border: 1px solid $gray-100;
+    border-radius: $border-radius-small;
+  }
+
+  @include email-code-block;
+}