diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-13 17:28:12 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-14 16:10:13 +0000 |
| commit | 33799a15368e8fab888a2479ccf5de96b8c91490 (patch) | |
| tree | 641853bb53ce34e0a2f79ad31e84e8e3533978f6 | |
| parent | 38ef0bbe7ee976f00896d9cdc56aa74618b6a167 (diff) | |
| download | gitlab-ce-33799a15368e8fab888a2479ccf5de96b8c91490.tar.gz | |
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
(cherry picked from commit 20226ed8e4231e4213db5644dab0fa576efbb8bc)
04853a4a Return border bottom on MR Tabs
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/57160-merge-request-tabs-header-is-missing-bottom-border.yml | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index a27594a5080..790d438c7e2 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -738,6 +738,8 @@ z-index: 103; background: $gray-light; color: $gl-text-color; + margin-top: -1px; + border-top: 1px solid $border-color; .mr-version-menus-container { display: flex; @@ -789,7 +791,6 @@ position: sticky; top: $header-height + $mr-tabs-height; width: 100%; - border-top: 1px solid $border-color; &.is-fileTreeOpen { margin-left: -16px; @@ -810,10 +811,7 @@ top: $header-height; z-index: 200; background-color: $white-light; - - @include media-breakpoint-down(md) { - border-bottom: 1px solid $border-color; - } + border-bottom: 1px solid $border-color; @include media-breakpoint-up(sm) { position: sticky; diff --git a/changelogs/unreleased/57160-merge-request-tabs-header-is-missing-bottom-border.yml b/changelogs/unreleased/57160-merge-request-tabs-header-is-missing-bottom-border.yml new file mode 100644 index 00000000000..3146d07db3d --- /dev/null +++ b/changelogs/unreleased/57160-merge-request-tabs-header-is-missing-bottom-border.yml @@ -0,0 +1,5 @@ +--- +title: Return bottom border on MR Tabs +merge_request: !25198 +author: +type: fixed |