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

@@ -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;

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);
+    }
+  }
 }
 
 /**

app/views/layouts/nav/_dashboard.html.haml

@@ -81,7 +81,7 @@
         = link_to '#', class: 'dashboard-shortcuts-web-ide', title: _('Web IDE') do
           = _('Web IDE')
 
-  = render_if_exists 'dashboard/operations/nav_link_icon'
+  = render_if_exists 'dashboard/operations/nav_link'
   - if can?(current_user, :read_instance_statistics)
     = nav_link(controller: [:conversational_development_index, :cohorts], html_options: { class: "d-none d-lg-block d-xl-block"}) do
       = link_to instance_statistics_root_path, title: _('Instance Statistics'), aria: { label: _('Instance Statistics') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do

changelogs/unreleased/55703-md-image-borders.yml

+---
+title: Only show borders for markdown images in notes
+merge_request: 25448
+author:
+type: fixed