diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_header.scss b/backend/app/assets/stylesheets/spree/backend/shared/_header.scss index e6144fdddbb..d936bd6f92a 100644 --- a/backend/app/assets/stylesheets/spree/backend/shared/_header.scss +++ b/backend/app/assets/stylesheets/spree/backend/shared/_header.scss @@ -1,10 +1,14 @@ .main-header { display: flex; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: $main-header-height; align-items: center; - padding: 15px $grid-gutter-width; + padding: 15px $grid-gutter-width 15px $width-sidebar + $grid-gutter-width; background-color: very-light($color-3, 4); border-bottom: 1px solid $color-border; - height: $main-header-height; @media print { display: none } } diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_layout.scss b/backend/app/assets/stylesheets/spree/backend/shared/_layout.scss index 8d8ab3cc72a..ad1ae7b6c38 100644 --- a/backend/app/assets/stylesheets/spree/backend/shared/_layout.scss +++ b/backend/app/assets/stylesheets/spree/backend/shared/_layout.scss @@ -15,7 +15,7 @@ body { } .content-wrapper { - @include padding(1rem $grid-gutter-width null); + @include padding($main-header-height + $font-size-root $grid-gutter-width null); &:not(.full-width) { @include margin(null auto); diff --git a/backend/app/views/spree/layouts/admin.html.erb b/backend/app/views/spree/layouts/admin.html.erb index 02d1fb3ca7b..d5f97f6bc02 100644 --- a/backend/app/views/spree/layouts/admin.html.erb +++ b/backend/app/views/spree/layouts/admin.html.erb @@ -6,7 +6,6 @@ <%= render "spree/admin/shared/navigation" %> - <%= render "spree/admin/shared/header" %> <%= render "spree/admin/shared/flash" %> <%= render "spree/admin/shared/spinner" %> @@ -21,6 +20,8 @@ <%= render "spree/admin/shared/sidebar" %> + <%# Has to be here because it's sticky, should sit on top of the content and using z-index is lame %> + <%= render "spree/admin/shared/header" %>