diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-06-15 00:53:34 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-06-15 00:53:34 +1000 |
| commit | dfc2d02cc6f848b65849525b6213574714855040 (patch) | |
| tree | f1ae76ce0fb487d60c1862588c0a3079e038f874 /app/assets/stylesheets | |
| parent | 14f27102b696672f02b5d1b2ab45688b711f4024 (diff) | |
| parent | ae853dba6b9e5f45aea0d14965c9691840db78f7 (diff) | |
| download | gitlab-ce-dfc2d02cc6f848b65849525b6213574714855040.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 62966-embed-zoom-call-in-issue-mvc
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index bfd96a4bc05..0bf911eec0a 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -154,11 +154,9 @@ } .toolbar-fullscreen-btn { - margin-left: $gl-padding; margin-right: -5px; @include media-breakpoint-down(xs) { - margin-left: 0; margin-right: 0; } } diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 4ebf1019456..d2d35d91e0b 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: 102; + z-index: 220; &::before { content: ''; @@ -1122,3 +1122,15 @@ table.code { outline: 0; } } + +.diff-suggest-popover { + &.popover { + width: 250px; + min-width: 250px; + z-index: 210; + } + + .popover-header { + display: none; + } +} |