diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-22 18:04:21 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-22 18:04:21 -0500 |
| commit | 3905cdfe2ec3c1c52b53dd09086c18ab6e1ebaec (patch) | |
| tree | a64cc92fbddc0cc707d4834060e02d18b40cc009 | |
| parent | 8112c24e47d49088fe58868e8b1c5a234bdfa210 (diff) | |
| download | gitlab-ce-3905cdfe2ec3c1c52b53dd09086c18ab6e1ebaec.tar.gz | |
Fix bad master merge
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index 3d5ed9ef3c5..e76525fdbf6 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -291,7 +291,7 @@ $colors: ( } .resolve-info { - @media (max-width: $screen-md-max) { + @media(max-width: map-get($grid-breakpoints, lg)-1) { margin-bottom: $gl-padding; } } |