Merge branch '4' into 5

# Conflicts: # client/dist/styles/main.css # yarn.lock
silverstripe · Sep 11, 2024 · 7ff9604 · 7ff9604
2 parents b186a32 + 67be150
commit 7ff9604
Show file tree

Hide file tree

Showing 3 changed files with 1,125 additions and 1,169 deletions.
diff --git a/client/dist/styles/main.css b/client/dist/styles/main.css
diff --git a/client/src/styles/cms.scss b/client/src/styles/cms.scss
@@ -33,7 +33,7 @@
     padding-right: 280px;
     position: absolute;
     height: 100%;
-    overflow: hidden hidden;
+    overflow: hidden;
     box-sizing: border-box;
 
     > .ss-tabset {