From 56f84a34272a745f281c244f0846744345e4917e Mon Sep 17 00:00:00 2001
From: Faruk Can <faruk.can@tarfin.com>
Date: Fri, 12 Jul 2019 17:46:29 +0000
Subject: z-index fixed for diff file dropdown

---
 app/assets/stylesheets/pages/diff.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/stylesheets/pages/diff.scss')

diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 3ffe8ae304d..95ea49ad465 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -14,7 +14,7 @@
       position: -webkit-sticky;
       position: sticky;
       top: $mr-file-header-top;
-      z-index: 220;
+      z-index: 120;
 
       &::before {
         content: '';
-- 
cgit v1.2.1


From fc0ff7cf033e6267d7348057faee0fbedf5b90e8 Mon Sep 17 00:00:00 2001
From: Samantha Ming <sming@gitlab.com>
Date: Sat, 10 Aug 2019 02:36:32 +0000
Subject: Replace ... with new expansion options

- expand upwards
- expand downwards
- expand all

in both inline and parallel views
---
 app/assets/stylesheets/pages/diff.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/assets/stylesheets/pages/diff.scss')

diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 95ea49ad465..ffb27e54f34 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -408,6 +408,14 @@ table.code {
   table-layout: fixed;
   border-radius: 0 0 $border-radius-default $border-radius-default;
 
+  tr:first-of-type.line_expansion > td {
+    border-top: 0;
+  }
+
+  tr:nth-last-of-type(2).line_expansion > td {
+    border-bottom: 0;
+  }
+
   tr.line_holder td {
     line-height: $code-line-height;
     font-size: $code-font-size;
-- 
cgit v1.2.1


From c0769b308a9df0de6374c480310c41c990bc7cc1 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 12 Aug 2019 19:20:15 -0600
Subject: Make all of the discussion toggle clickable

---
 app/assets/stylesheets/pages/diff.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/assets/stylesheets/pages/diff.scss')

diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index ffb27e54f34..77a2fd6b876 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -1032,7 +1032,6 @@ table.code {
   $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px;
   top: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px;
   max-height: calc(100vh - #{$top-pos});
-  padding-right: $gl-padding;
   z-index: 202;
 
   .with-performance-bar & {
@@ -1043,7 +1042,7 @@ table.code {
 
   .drag-handle {
     bottom: 16px;
-    transform: translateX(-6px);
+    transform: translateX(10px);
   }
 }
 
-- 
cgit v1.2.1