- {{plugin-outlet name="above-main-container" connectorTagName="div"}}
-
- {{#if showTop}}
- {{custom-html name="top"}}
- {{/if}}
- {{notification-consent-banner}}
- {{pwa-install-banner}}
- {{global-notice}}
- {{create-topics-notice}}
- {{plugin-outlet name="top-notices" connectorTagName="div" args=(hash currentPath=router._router.currentPath)}}
-
-
- {{outlet}}
- {{outlet "user-card"}}
+
+ {{plugin-outlet name="above-main-container" connectorTagName="div"}}
+
+ {{#if showTop}}
+ {{custom-html name="top"}}
+ {{/if}}
+ {{notification-consent-banner}}
+ {{pwa-install-banner}}
+ {{global-notice}}
+ {{create-topics-notice}}
+ {{plugin-outlet name="top-notices" connectorTagName="div" args=(hash currentPath=router._router.currentPath)}}
+
+ {{outlet}}
+ {{outlet "user-card"}}
{{plugin-outlet name="above-footer" connectorTagName="div" args=(hash showFooter=showFooter)}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs b/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs
deleted file mode 100644
index 91657f9f4c6..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-{{#if @shouldDisplay}}
-
-{{/if}}
diff --git a/app/assets/javascripts/discourse/app/widgets/header-contents.js b/app/assets/javascripts/discourse/app/widgets/header-contents.js
index 7f13995929f..5ce69e3b2d5 100644
--- a/app/assets/javascripts/discourse/app/widgets/header-contents.js
+++ b/app/assets/javascripts/discourse/app/widgets/header-contents.js
@@ -4,9 +4,6 @@ import hbs from "discourse/widgets/hbs-compiler";
createWidget("header-contents", {
tagName: "div.contents.clearfix",
template: hbs`
- {{#if attrs.sidebarEnabled}}
- {{sidebar-toggle attrs=attrs}}
- {{/if}}
{{home-logo attrs=attrs}}
{{#if attrs.topic}}
{{header-topic-info attrs=attrs}}
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 9d289ae005d..4885bbf1981 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -400,12 +400,7 @@ export default createWidget("header", {
return panels;
};
- let contentsAttrs = {
- contents,
- minimized: !!attrs.topic,
- sidebarEnabled: this.currentUser?.experimental_sidebar_enabled,
- };
-
+ let contentsAttrs = { contents, minimized: !!attrs.topic };
return h(
"div.wrap",
this.attach("header-contents", Object.assign({}, attrs, contentsAttrs))
diff --git a/app/assets/javascripts/discourse/app/widgets/sidebar-toggle.js b/app/assets/javascripts/discourse/app/widgets/sidebar-toggle.js
deleted file mode 100644
index b39163c0f32..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/sidebar-toggle.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { createWidget } from "discourse/widgets/widget";
-
-export default createWidget("sidebar-toggle", {
- tagName: "span.header-sidebar-toggle",
-
- html() {
- return [
- this.attach("button", {
- title: "",
- icon: "bars",
- action: "toggleSidebar",
- className: "btn btn-flat",
- }),
- ];
- },
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js
deleted file mode 100644
index c173b7e4d17..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { click, visit } from "@ember/test-helpers";
-import {
- acceptance,
- conditionalTest,
- exists,
-} from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import { isLegacyEmber } from "discourse-common/config/environment";
-
-acceptance("Sidebar - Anon User", function () {
- // Don't show sidebar for anon user until we know what we want to display
- test("sidebar is not displayed", async function (assert) {
- await visit("/");
-
- assert.ok(!exists("#main-outlet-wrapper.has-sidebar"));
- assert.ok(!exists(".sidebar-wrapper"));
- });
-});
-
-acceptance("Sidebar - User with sidebar disabled", function (needs) {
- needs.user({ experimental_sidebar_enabled: false });
-
- conditionalTest(
- "sidebar is not displayed",
- !isLegacyEmber(),
- async function (assert) {
- await visit("/");
-
- assert.ok(!exists("#main-outlet-wrapper.has-sidebar"));
- assert.ok(!exists(".sidebar-wrapper"));
- }
- );
-});
-
-acceptance("Sidebar - User with sidebar enabled", function (needs) {
- needs.user({ experimental_sidebar_enabled: true });
-
- conditionalTest(
- "hiding and displaying sidebar",
- !isLegacyEmber(),
- async function (assert) {
- await visit("/");
-
- assert.ok(
- exists("#main-outlet-wrapper.has-sidebar"),
- "adds sidebar utility class on main outlet wrapper"
- );
-
- assert.ok(exists(".sidebar-wrapper"), "displays the sidebar by default");
-
- await click(".header-sidebar-toggle .btn");
-
- assert.ok(
- !exists("#main-outlet-wrapper.has-sidebar"),
- "removes sidebar utility class from main outlet wrapper"
- );
-
- assert.ok(!exists(".sidebar-wrapper"), "hides the sidebar");
-
- await click(".header-sidebar-toggle .btn");
-
- assert.ok(exists(".sidebar-wrapper"), "displays the sidebar");
- }
- );
-});
diff --git a/app/assets/stylesheets/common/base/_index.scss b/app/assets/stylesheets/common/base/_index.scss
index 6741fdc6bbe..f6b8e49d0a0 100644
--- a/app/assets/stylesheets/common/base/_index.scss
+++ b/app/assets/stylesheets/common/base/_index.scss
@@ -44,7 +44,6 @@
@import "search";
@import "share_link";
@import "shared-drafts";
-@import "sidebar";
@import "tagging";
@import "tooltip";
@import "topic-admin-menu";
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index b9cdd3cfb34..0126ae6cc55 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -651,7 +651,6 @@ table {
#main-outlet {
padding-top: 2.5em;
- grid-area: content;
}
#main {
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 0cc0a38922e..07cffbaf119 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -14,6 +14,7 @@
backface-visibility: hidden; /** do magic for scrolling performance **/
> .wrap {
+ box-sizing: border-box;
width: 100%;
height: 100%;
diff --git a/app/assets/stylesheets/common/base/sidebar.scss b/app/assets/stylesheets/common/base/sidebar.scss
deleted file mode 100644
index d1c87b6a639..00000000000
--- a/app/assets/stylesheets/common/base/sidebar.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-.header-sidebar-toggle {
- margin-right: 1em;
- margin-left: -10px;
-
- button {
- position: relative;
- font-size: var(--font-up-2);
-
- .discourse-no-touch & {
- &:hover {
- background: var(--primary-low);
- .d-icon {
- color: var(--primary-medium);
- }
- }
- }
- }
-}
-
-.sidebar-wrapper {
- grid-area: sidebar;
- position: sticky;
- top: var(--header-offset);
- height: calc(100vh - var(--header-offset));
- align-self: start;
- overflow-y: auto;
- background-color: var(--primary-very-low);
-}
-
-.sidebar-container {
- box-sizing: border-box;
- height: 100%;
- width: 240px;
- padding: 1em;
-}
-
-.sidebar-toggle {
- display: flex;
- justify-content: flex-end;
-}
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 18893c7aae1..8fb5a9dd553 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -182,16 +182,3 @@ input {
min-width: 0;
}
}
-
-#main-outlet-wrapper {
- display: grid;
- grid-template-areas: "content";
- grid-template-columns: 1fr;
- gap: 0;
-
- &.has-sidebar {
- grid-template-areas: "sidebar content";
- grid-template-columns: 240px 1fr;
- gap: 0 2em;
- }
-}