diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-27 08:30:06 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-27 08:30:06 +0000 |
| commit | 80735a2d4b3615e5bd94ea6032b304b58dd2c357 (patch) | |
| tree | c28d14f5bcd8f55c3102ab9099831f58c41be91f | |
| parent | edcd28ca44649b5b3e0729a95a4d6b684e1ff7cb (diff) | |
| parent | 7544a6e2591a34a5ca298f5d63a45ff2aab29ccb (diff) | |
| download | gitlab-ce-80735a2d4b3615e5bd94ea6032b304b58dd2c357.tar.gz | |
Merge branch 'gt-fix-styling-for-framework-system-messages' into 'master'
Fix styling for `app/assets/stylesheets/framework/notes.scss`
Closes #59884
See merge request gitlab-org/gitlab-ce!26879
| -rw-r--r-- | app/assets/stylesheets/framework/system_messages.scss | 10 | ||||
| -rw-r--r-- | app/views/layouts/fullscreen.html.haml | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/system_messages.scss b/app/assets/stylesheets/framework/system_messages.scss index 6205ccaa52f..5c298d5a588 100644 --- a/app/assets/stylesheets/framework/system_messages.scss +++ b/app/assets/stylesheets/framework/system_messages.scss @@ -98,14 +98,4 @@ top: auto; bottom: auto; } - - .content-wrapper { - .with-system-header & { - margin-top: 0; - } - - .with-system-footer & { - margin-top: 0; - } - } } diff --git a/app/views/layouts/fullscreen.html.haml b/app/views/layouts/fullscreen.html.haml index e29f646ed4f..fa04b5be9f2 100644 --- a/app/views/layouts/fullscreen.html.haml +++ b/app/views/layouts/fullscreen.html.haml @@ -10,5 +10,5 @@ = render "layouts/broadcast" = yield :flash_message = render "layouts/flash" - .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch" } + .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch mt-0" } = yield |