handle sidebar context

assets/sass/_theme/_utils.sass

@@ -11,7 +11,8 @@ $space-unit: 4 !default
 
 @mixin in-page-with-sidebar
     @include media-breakpoint-up(desktop)
-        body:not(.full-width) &
+        body:not(.full-width) &,
+        &:is(body):not(.full-width)
             @content
 
 @mixin in-page-without-sidebar
@@ -443,28 +444,24 @@ $space-unit: 4 !default
     src: $src
 
 @mixin sidebar($side: start)
-    @include media-breakpoint-down(desktop)
-        padding: 0 half($grid-gutter-sm)
-        margin-bottom: $spacing3
-    @include media-breakpoint-up(desktop)
-        @if $side == start
-            @include container-margin-left
-            left: 0
-        @else
-            @include container-margin-right
-            right: 0
-        margin-top: 0
-        top: 0
-        height: 100%
-        position: absolute
-        width: col-outside-container(4)
-        & > div
-            @include sticky($spacing1)
-        .toc-container
-            border-top: 1px solid $color-border
-            padding-top: $spacing1
-            position: static
-            margin-left: 0
+    @if $side == start
+        @include container-margin-left
+        left: 0
+    @else
+        @include container-margin-right
+        right: 0
+    margin-top: 0
+    top: 0
+    height: 100%
+    position: absolute
+    width: col-outside-container(4)
+    & > div
+        @include sticky($spacing1)
+    .toc-container
+        border-top: 1px solid $color-border
+        padding-top: $spacing1
+        position: static
+        margin-left: 0
 
 // Old browsers support
 

assets/sass/_theme/design-system/layout.sass

@@ -67,6 +67,11 @@ ol
         .heading h2, .block .block-content
             padding-left: offset(4)
 
+.section-sidebar
+    @include media-breakpoint-down(desktop)
+        padding: 0 half($grid-gutter-sm)
+        margin-bottom: $spacing3
+
 details
     &:not([open]):hover
        summary::after

assets/sass/_theme/sections/papers.sass

@@ -116,18 +116,17 @@
                         flex-direction: column
                         span
                             order: 3
-    .document-content
-        &.sidebar-on-start
-            .section-sidebar
-                @include sidebar(start)
-            @include media-breakpoint-up(desktop)
+    @include in-page-with-sidebar
+        .document-content
+            &.sidebar-on-start
+                .section-sidebar
+                    @include sidebar(start)
                 .container
                     .content
                         padding-left: offset(4)
-        &.sidebar-on-end
-            .section-sidebar
-                @include sidebar(end)
-            @include media-breakpoint-up(desktop)
+            &.sidebar-on-end
+                .section-sidebar
+                    @include sidebar(end)
                 .container
                     .content
                         padding-right: offset(4)