Merge branch 'revert-a91ff32b' into 'master'

Revert "Merge branch '25709-diff-file-overflow' into 'master'"

See merge request !8688

2 files changed, 0 insertions, 38 deletions

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index db1c8da06d0..c51912b4ac4 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -231,37 +231,3 @@ span.idiff {
     }
   }
 }
-
-
-.file-title-flex-parent {
-  display: flex;
-  align-items: center;
-  background-color: $gray-light;
-  border-bottom: 1px solid $border-color;
-  padding: 10px $gl-padding;
-  margin: 0;
-  border-radius: 3px 3px 0 0;
-
-  > a {
-    flex: 1;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    color: $gl-text-color;
-  }
-
-  small {
-    margin: 0 10px 0 0;
-  }
-
-  .file-actions {
-    white-space: nowrap;
-
-    .btn {
-      padding: 0 10px;
-      font-size: 13px;
-      line-height: 28px;
-      display: inline-block;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 8b784c2a439..96ba7c40634 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -37,10 +37,6 @@
   .file-title {
     cursor: pointer;
 
-    a:hover {
-      text-decoration: none;
-    }
-
     &:hover {
       background-color: $gray-normal;
     }