1 files changed, 20 insertions, 20 deletions
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index f0495fdc94e..7a77256398e 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -34,7 +34,7 @@
     @media (min-width: map-get($grid-breakpoints, md)) {
       // The `+11` is to ensure the file header border shows when scrolled -
       // the bottom of the compare-versions header and the top of the file header
-      $mr-file-header-top: calc(#{$mr-version-controls-height} + #{$header-height} + #{$mr-tabs-height} + 11px);
+      $mr-file-header-top: calc(#{$header-height} + #{$mr-tabs-height});
 
       position: -webkit-sticky;
       position: sticky;
@@ -582,25 +582,6 @@ table.code {
   }
 }
 
-.diff-expansion-cell {
-  flex: 1 1;
-  min-width: max-content;
-}
-
-.diff-expansion-cell-middle {
-  flex: 0 1 max-content;
-}
-
-@media only screen and (min-width: $breakpoint-xl) {
-  .diff-expansion-cell-start {
-    text-align: right;
-  }
-
-  .diff-expansion-cell-end {
-    text-align: left;
-  }
-}
-
 // Merge request diff grid layout
 .diff-grid {
   .diff-td {
@@ -612,6 +593,10 @@ table.code {
   .diff-grid-row {
     display: grid;
     grid-template-columns: 1fr 1fr;
+
+    &.diff-grid-row-full {
+      grid-template-columns: 1fr;
+    }
   }
 
   .diff-grid-left,
@@ -626,6 +611,14 @@ table.code {
     grid-template-columns: 50px 1fr !important;
   }
 
+  .diff-grid-2-col {
+    grid-template-columns: 100px 1fr !important;
+
+    &.parallel {
+      grid-template-columns: 50px 1fr !important;
+    }
+  }
+
   &.inline-diff-view .diff-grid-3-col {
     grid-template-columns: 50px 50px 1fr !important;
   }
@@ -1209,3 +1202,10 @@ table.code {
   position: absolute;
   bottom: 100vh;
 }
+
+.diff-line-expand-button {
+  &:hover,
+  &:focus {
+    @include gl-bg-gray-200;
+  }
+}