diff --git a/core/modules/toolbar/css/toolbar.module.css b/core/modules/toolbar/css/toolbar.module.css index f67ac2e..b6b7c4a 100644 --- a/core/modules/toolbar/css/toolbar.module.css +++ b/core/modules/toolbar/css/toolbar.module.css @@ -60,7 +60,7 @@ * is active. The toolbar container, that contains the bar and the trays, is * position absolutely so that it scrolls with the page. Otherwise, on smaller * screens, the components of the admin toolbar are positioned statically. */ -body.toolbar-fixed .toolbar-oriented, +.toolbar-oriented, .toolbar-oriented .toolbar-bar, .toolbar-oriented .toolbar-tray { left: 0; @@ -72,15 +72,10 @@ body.toolbar-fixed .toolbar-oriented, .toolbar-oriented .toolbar-bar { z-index: 502; } -/* Position the admin toolbar fixed when the configured standard breakpoint is - * active. */ -body.toolbar-fixed .toolbar-oriented .toolbar-bar { - position: fixed; -} /* When the configured narrow breakpoint is active, the toolbar is sized to wrap * around the trays in order to provide a context for scrolling tray content * that is taller than the viewport. */ -body.toolbar-tray-open.toolbar-fixed.toolbar-vertical .toolbar-oriented { +body.toolbar-tray-open.toolbar-vertical .toolbar-oriented { bottom: 0; width: 240px; width: 15rem; @@ -182,14 +177,14 @@ body.toolbar-tray-open.toolbar-fixed.toolbar-vertical .toolbar-oriented { /* When the configured standard breakpoint is active and the tray is in a * horizontal position, the tray is fixed to the top of the viewport and does * not scroll with the page contents. */ -body.toolbar-fixed .toolbar .toolbar-tray-horizontal { +.toolbar .toolbar-tray-horizontal { position: fixed; } /* When the configured standard breakpoint is active and the tray is in a * vertical position, the tray does not scroll with the page. The contents of * the tray scroll within the confines of the viewport. */ .toolbar .toolbar-tray-vertical.is-active, -body.toolbar-fixed .toolbar .toolbar-tray-vertical { +.toolbar .toolbar-tray-vertical { height: 100%; overflow-x: hidden; overflow-y: auto; @@ -208,23 +203,23 @@ body.toolbar-fixed .toolbar .toolbar-tray-vertical { } /* When the configured standard breakpoint is active, the tray appears to push * the page content away from the edge of the viewport. */ -body.toolbar-tray-open.toolbar-vertical.toolbar-fixed { +body.toolbar-tray-open.toolbar-vertical { margin-left: 240px; /* LTR */ margin-left: 15rem; /* LTR */ } @media print { - body.toolbar-tray-open.toolbar-vertical.toolbar-fixed { + body.toolbar-tray-open.toolbar-vertical { margin-left: 0; } } -[dir="rtl"] body.toolbar-tray-open.toolbar-vertical.toolbar-fixed { +[dir="rtl"] body.toolbar-tray-open.toolbar-vertical { margin-left: auto; margin-left: auto; margin-right: 240px; margin-right: 15rem; } @media print { - [dir="rtl"] body.toolbar-tray-open.toolbar-vertical.toolbar-fixed { + [dir="rtl"] body.toolbar-tray-open.toolbar-vertical { margin-right: 0; } } diff --git a/core/modules/toolbar/js/models/ToolbarModel.js b/core/modules/toolbar/js/models/ToolbarModel.js index 357692c..38d9dab 100644 --- a/core/modules/toolbar/js/models/ToolbarModel.js +++ b/core/modules/toolbar/js/models/ToolbarModel.js @@ -59,14 +59,6 @@ isOriented: false, /** - * Indicates whether the toolbar is positioned absolute (false) or fixed - * (true). - * - * @type {bool} - */ - isFixed: false, - - /** * Menu subtrees are loaded through an AJAX request only when the Toolbar * is set to a vertical orientation. *