1 files changed, 6 insertions, 35 deletions

diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index 7a77256398e..904d041fdc9 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -456,19 +456,6 @@ table.code {
   table-layout: fixed;
   border-radius: 0 0 $border-radius-default $border-radius-default;
 
-  .diff-tr:first-of-type.line_expansion > .diff-td,
-  tr:first-of-type.line_expansion > td {
-    border-top: 0;
-  }
-
-  .diff-tr:nth-last-of-type(2).line_expansion > .diff-td,
-  tr:nth-last-of-type(2).line_expansion,
-  tr:last-of-type.line_expansion {
-    > td {
-      border-bottom: 0;
-    }
-  }
-
   .diff-tr.line_holder .diff-td,
   tr.line_holder td {
     line-height: $code-line-height;
@@ -557,6 +544,10 @@ table.code {
           left: 0;
         }
       }
+
+      img {
+        max-width: 100%;
+      }
     }
   }
 
@@ -607,10 +598,6 @@ table.code {
     grid-template-columns: 50px 8px 0 1fr;
   }
 
-  .diff-grid-3-col {
-    grid-template-columns: 50px 1fr !important;
-  }
-
   .diff-grid-2-col {
     grid-template-columns: 100px 1fr !important;
 
@@ -619,10 +606,6 @@ table.code {
     }
   }
 
-  &.inline-diff-view .diff-grid-3-col {
-    grid-template-columns: 50px 50px 1fr !important;
-  }
-
   .diff-grid-comments {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -839,18 +822,6 @@ table.code {
   }
 }
 
-.commits-container {
-  .diff-files-changed {
-    @include media-breakpoint-up(sm) {
-      top: $header-height;
-
-      .with-performance-bar & {
-        top: calc(#{$header-height} + #{$performance-bar-height});
-      }
-    }
-  }
-}
-
 .diff-files-changed {
   background-color: $body-bg;
 
@@ -861,11 +832,11 @@ table.code {
 
   @include media-breakpoint-up(sm) {
     @include gl-sticky;
-    top: calc(#{$header-height} + #{$mr-tabs-height});
+    top: $header-height;
     z-index: 200;
 
     .with-performance-bar & {
-      top: calc(#{$header-height} + #{$mr-tabs-height} + #{$performance-bar-height});
+      top: calc(#{$header-height} + #{$performance-bar-height});
     }
 
     &.is-stuck {