Fix TheAdminTheme layout margin and padding (#15143)

OrchardCMS · Jan 25, 2024 · b85604c · b85604c
1 parent cfbf26a
commit b85604c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/OrchardCore.Themes/TheAdmin/Assets/scss/admin/_layout.scss b/src/OrchardCore.Themes/TheAdmin/Assets/scss/admin/_layout.scss
@@ -2,22 +2,22 @@
 @import '../mixins/_cursors';
 @import '../../../node_modules/bootstrap/scss/mixins/_breakpoints';
 
-body {
-    margin-bottom: var(--oc-footer-height);
+body, html {
     height: 100%;
 }
 
 @include cursor-class(move);
 @include cursor-class(pointer);
 
 .ta-wrapper {
+    height: 100%;
 }
 
 .ta-content {
-    padding: 15px;
+    padding: 1rem;
+    height: 100%;
     margin-left: var(--oc-start-navigation-width);
-    margin-top: var(--oc-top-nav-height);
-    margin-bottom: var(--oc-footer-height);
+    padding-top: calc(var(--oc-top-nav-height, 0) + 1rem);
     transition: margin-left 0.2s ease-in-out;
 
     h1 {

diff --git a/src/OrchardCore.Themes/TheAdmin/wwwroot/css/admin-layout.css b/src/OrchardCore.Themes/TheAdmin/wwwroot/css/admin-layout.css
@@ -33,14 +33,10 @@
   --bs-bg-opacity: 1;
 }
 
-body {
+body, html {
   height: 100%;
 }
 
-[dir] body {
-  margin-bottom: var(--oc-footer-height);
-}
-
 [dir] .cursor-move {
   cursor: move;
 }
@@ -49,10 +45,17 @@ body {
   cursor: pointer;
 }
 
+.ta-wrapper {
+  height: 100%;
+}
+
+.ta-content {
+  height: 100%;
+}
+
 [dir] .ta-content {
-  padding: 15px;
-  margin-top: var(--oc-top-nav-height);
-  margin-bottom: var(--oc-footer-height);
+  padding: 1rem;
+  padding-top: calc(var(--oc-top-nav-height, 0) + 1rem);
 }
 
 [dir=ltr] .ta-content {