diff options
author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-06 14:44:13 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-06 14:44:13 +0000 |
commit | fec96453e73ae715c6888c7369cbb1b020e873b5 (patch) | |
tree | a3ceb858acb6d9c6785f684fa18923cbb2ecfee4 /app/assets/stylesheets/pages/merge_requests.scss | |
parent | c50eed5400d97c9f566b25f76eb8d0057f910a11 (diff) | |
download | gitlab-ce-fec96453e73ae715c6888c7369cbb1b020e873b5.tar.gz |
Merge request tabs fixes
- Makes activity dropdown and resolved counter smaller
- Uses grid for spacing
- Removes scrolling on MR tabs
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 77b40fe2d30..8cb3fab74e0 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -846,15 +846,40 @@ display: flex; justify-content: space-between; - @include media-breakpoint-down(sm) { - flex-direction: column-reverse; + @include media-breakpoint-down(xs) { + .discussion-filter-container, + .line-resolve-all-container { + margin-bottom: $gl-padding-4; + } } .discussion-filter-container { - margin-top: $gl-padding-8; - &:not(:only-child) { - padding-right: $gl-padding-8; + margin: $gl-padding-4; + } + } + + .merge-request-tabs { + height: $grid-size * 6; + } +} + +// Wrap MR tabs/buttons so you don't have to scroll on desktop +@include media-breakpoint-down(md) { + .merge-request-tabs-container, + .epic-tabs-container { + flex-direction: column-reverse; + padding-top: $gl-padding-8; + } +} + +@include media-breakpoint-down(lg) { + .right-sidebar-expanded { + .merge-request-tabs-container, + .epic-tabs-container { + flex-direction: column-reverse; + align-items: flex-start; + padding-top: $gl-padding-8; } } } |