1 files changed, 3 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 7a92adf7b7b..23dbe440d33 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -35,8 +35,9 @@ body {
   }
 }
 
-.content-wrapper-margin {
-  margin-top: $header-height;
+.layout-page {
+  padding-top: $calc-application-header-height;
+  padding-bottom: $calc-application-footer-height;
 }
 
 .content-wrapper {
@@ -142,11 +143,6 @@ body {
   @include gl-overflow-hidden;
 }
 
-
-.with-performance-bar .layout-page {
-  margin-top: calc(#{$header-height} + #{$performance-bar-height});
-}
-
 .fullscreen-layout {
   padding-top: 0;
   height: 100vh;