From f6324f38986f454fc93d1b00683e27d88778ff6e Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Tue, 22 Apr 2014 19:59:59 -0700
Subject: [PATCH] Issue #2056173 by philipz, Sam152 | tim.plunkett: Regression:
Two-column layout is broken by vertical toolbar.
---
core/modules/block/css/block.admin.css | 7 +++----
core/modules/node/css/node.module.css | 9 ++++-----
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/core/modules/block/css/block.admin.css b/core/modules/block/css/block.admin.css
index 42ef70d045d9..bd0d7fdfeb29 100644
--- a/core/modules/block/css/block.admin.css
+++ b/core/modules/block/css/block.admin.css
@@ -104,11 +104,10 @@ screen and (min-width: 780px),
* toolbar width (240px). In this case, 240px + 780px.
*/
@media
-screen and (max-width: 1020px),
-(orientation: landscape) and (max-device-height: 1020px) {
+screen and (max-width: 1020px) {
- .toolbar-vertical .block-list-primary,
- .toolbar-vertical .block-list-secondary {
+ .toolbar-vertical.toolbar-tray-open .block-list-primary,
+ .toolbar-vertical.toolbar-tray-open .block-list-secondary {
float: none;
width: auto;
padding-right: 0;
diff --git a/core/modules/node/css/node.module.css b/core/modules/node/css/node.module.css
index 1f92354589cc..5ae0e5f95e83 100644
--- a/core/modules/node/css/node.module.css
+++ b/core/modules/node/css/node.module.css
@@ -56,12 +56,11 @@
* toolbar width (240px). In this case, 240px + 780px.
*/
@media
- screen and (max-width: 1020px),
- (orientation: landscape) and (max-device-height: 1020px) {
+ screen and (max-width: 1020px) {
- .toolbar-vertical .layout-region-node-main,
- .toolbar-vertical .layout-region-node-footer,
- .toolbar-vertical .layout-region-node-secondary {
+ .toolbar-vertical.toolbar-tray-open .layout-region-node-main,
+ .toolbar-vertical.toolbar-tray-open .layout-region-node-footer,
+ .toolbar-vertical.toolbar-tray-open .layout-region-node-secondary {
float: none;
width: auto;
padding-right: 0;
--
GitLab