diff --git a/core/modules/node/css/node.admin.css b/core/modules/node/css/node.admin.css deleted file mode 100644 index 101a38d539..0000000000 --- a/core/modules/node/css/node.admin.css +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @file - * Styles for administration pages. - */ - -/** - * Revisions overview screen. - */ -.revision-current { - background: #ffc; -} diff --git a/core/modules/node/css/node.module.css b/core/modules/node/css/node.admin.theme.css similarity index 83% rename from core/modules/node/css/node.module.css rename to core/modules/node/css/node.admin.theme.css index c564633691..0b1b6c7e44 100644 --- a/core/modules/node/css/node.module.css +++ b/core/modules/node/css/node.admin.theme.css @@ -1,10 +1,10 @@ /** * @file - * Styles for administration pages. + * Styles for node administration. */ /** - * Node add/edit form layout + * Node add/edit form layout. */ /* Narrow screens */ @@ -13,23 +13,20 @@ } /* Wide screens */ -@media - screen and (min-width: 780px), - (orientation: landscape) and (min-device-height: 780px) { - +@media screen and (min-width: 780px), (orientation: landscape) and (min-device-height: 780px) { .layout-region-node-main, .layout-region-node-footer { float: left; /* LTR */ - box-sizing: border-box; width: 65%; padding-right: 2em; /* LTR */ + box-sizing: border-box; } [dir="rtl"] .layout-region-node-main, [dir="rtl"] .layout-region-node-footer { float: right; - padding-right: 0; padding-left: 2em; + padding-right: 0; } .layout-region-node-secondary { @@ -60,12 +57,10 @@ /** * The vertical toolbar mode gets triggered for narrow screens, which throws off * the intent of media queries written for the viewport width. When the vertical - * toolbar is on, we need to suppress layout for the original media width + the - * toolbar width (240px). In this case, 240px + 780px. + * toolbar is on, we need to suppress layout for the original media width the + * toolbar width (240px). In this case, 240px 780px. */ -@media - screen and (max-width: 1020px) { - +@media screen and (max-width: 1020px) { .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 { @@ -74,3 +69,8 @@ padding-right: 0; } } + +/* Revision color. */ +.revision-current { + background: #ffc; +} diff --git a/core/modules/node/css/node.preview.css b/core/modules/node/css/node.theme.css similarity index 94% rename from core/modules/node/css/node.preview.css rename to core/modules/node/css/node.theme.css index 15205ab92d..dc47e7ed72 100644 --- a/core/modules/node/css/node.preview.css +++ b/core/modules/node/css/node.theme.css @@ -6,17 +6,18 @@ .node-preview-container { position: fixed; z-index: 499; - box-sizing: border-box; width: 100%; padding: 10px; + box-sizing: border-box; } @media only screen and (min-width: 36em) { .node-preview-container .form-type-select { margin-left: 25%; /* LTR */ } + [dir="rtl"] .node-preview-container .form-type-select { margin-right: 25%; - margin-left: 0; + margin-left: 0%; } } diff --git a/core/modules/node/node.libraries.yml b/core/modules/node/node.libraries.yml index d599c2aa18..5ff4aadd1e 100644 --- a/core/modules/node/node.libraries.yml +++ b/core/modules/node/node.libraries.yml @@ -1,8 +1,8 @@ drupal.node: version: VERSION css: - layout: - css/node.module.css: {} + theme: + css/node.admin.theme.css: { } js: node.js: {} dependencies: @@ -13,7 +13,7 @@ drupal.node.preview: version: VERSION css: theme: - css/node.preview.css: {} + css/node.theme.css: {} js: node.preview.js: {} dependencies: @@ -32,15 +32,3 @@ drupal.content_types: - core/jquery - core/drupal - core/drupal.form - -form: - version: VERSION - css: - layout: - css/node.module.css: {} - -drupal.node.admin: - version: VERSION - css: - theme: - css/node.admin.css: {} diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php index ed80d7ced7..581d7bd18d 100644 --- a/core/modules/node/src/Controller/NodeController.php +++ b/core/modules/node/src/Controller/NodeController.php @@ -259,7 +259,7 @@ public function revisionOverview(NodeInterface $node) { '#rows' => $rows, '#header' => $header, '#attached' => [ - 'library' => ['node/drupal.node.admin'], + 'library' => ['node/drupal.node'], ], '#attributes' => ['class' => 'node-revision-table'], ];