From 77ac026e33ca4b8841836393410801b4d144fe44 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 21 Feb 2019 13:32:01 +1100
Subject: Only show borders for images in notes

Compatible with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5162
---
 app/assets/stylesheets/framework/markdown_area.scss |  8 --------
 app/assets/stylesheets/framework/typography.scss    | 10 ++++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 961de8402ef..d6c4e68f68f 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -149,14 +149,6 @@
     margin: 10px 0;
   }
 
-  // Border around images in issue and MR comments.
-  img:not(.emoji) {
-    border: 1px solid $white-normal;
-    padding: 5px;
-    margin: 5px 0;
-    // Ensure that image does not exceed viewport
-    max-height: calc(100vh - 100px);
-  }
 
   table:not(.js-syntax-highlight) {
     @include markdown-table;
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index bf85acdc0d6..1b36c1f4862 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -371,6 +371,16 @@ code {
 
 .md:not(.use-csslab) {
   @include md-typography;
+
+  &:not(.wiki) {
+    img:not(.emoji) {
+      border: 1px solid $white-normal;
+      padding: 5px;
+      margin: 5px 0;
+      // Ensure that image does not exceed viewport
+      max-height: calc(100vh - 100px);
+    }
+  }
 }
 
 /**
-- 
cgit v1.2.3