Commit 20226ed8 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '57160-merge-request-tabs-header-is-missing-bottom-border' into 'master'

Resolve "Merge Request Tabs Header is missing bottom border"

Closes #57160

See merge request gitlab-org/gitlab-ce!25198
parents 1423d238 04853a4a
...@@ -738,6 +738,8 @@ ...@@ -738,6 +738,8 @@
z-index: 103; z-index: 103;
background: $gray-light; background: $gray-light;
color: $gl-text-color; color: $gl-text-color;
margin-top: -1px;
border-top: 1px solid $border-color;
.mr-version-menus-container { .mr-version-menus-container {
display: flex; display: flex;
...@@ -789,7 +791,6 @@ ...@@ -789,7 +791,6 @@
position: sticky; position: sticky;
top: $header-height + $mr-tabs-height; top: $header-height + $mr-tabs-height;
width: 100%; width: 100%;
border-top: 1px solid $border-color;
&.is-fileTreeOpen { &.is-fileTreeOpen {
margin-left: -16px; margin-left: -16px;
...@@ -810,10 +811,7 @@ ...@@ -810,10 +811,7 @@
top: $header-height; top: $header-height;
z-index: 200; z-index: 200;
background-color: $white-light; background-color: $white-light;
border-bottom: 1px solid $border-color;
@include media-breakpoint-down(md) {
border-bottom: 1px solid $border-color;
}
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
position: sticky; position: sticky;
......
---
title: Return bottom border on MR Tabs
merge_request: !25198
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment