diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php
index e44290e..b52589b 100644
--- a/core/modules/node/lib/Drupal/node/NodeFormController.php
+++ b/core/modules/node/lib/Drupal/node/NodeFormController.php
@@ -108,23 +108,23 @@ public function form(array $form, array &$form_state, EntityInterface $node) {
'#access' => isset($language_configuration['language_hidden']) && !$language_configuration['language_hidden'],
);
- // Build variables for use in the node settings summary.
+ // Build variables for use in the node settings header.
$publish_state = '';
$last_saved = '';
$author = '';
if (!$node->isNew()) {
$publish_state = (isset($node->status) && $node->status == 1) ? t('Published') : t('Not published');
- $last_saved = '' . t('Last saved') . ': ' .format_date($node->changed);
+ $last_saved = '' . t('Last saved') . ': ' . format_date($node->changed);
$author = '' . t('Author') . ': ' . user_format_name(user_load($node->uid));
}
else {
$publish_state = t('Not published');
$last_saved = t('Not saved yet');
}
- // Create the node settings summary that appears (by default) at the top
+ // Create the node settings header that appears (by default) at the top
// of the settings region. Always contains publish state, date/time last
// saved, and author.
- $form['settings_summary'] = array (
+ $form['settings_header'] = array (
'#type' => 'fieldset',
'publish_state' => array(
'#type' => 'item',
@@ -142,7 +142,7 @@ public function form(array $form, array &$form_state, EntityInterface $node) {
// Add a log field if the "Create new revision" option is checked, or if the
// current user has the ability to check that option.
- $form['settings_summary']['revision_information'] = array(
+ $form['settings_header']['revision_information'] = array(
'#type' => 'fieldset',
'#title' => t('Revision information'),
'#title_display' => 'invisible',
@@ -156,19 +156,19 @@ public function form(array $form, array &$form_state, EntityInterface $node) {
'#access' => $node->isNewRevision() || user_access('administer nodes'),
);
- $new_revision_control_default_value = false;
+ $new_revision_control_default_value = FALSE;
if (!$node->isNew()) {
$new_revision_control_default_value = $node->isNewRevision();
}
- $form['settings_summary']['revision_information']['revision'] = array(
+ $form['settings_header']['revision_information']['revision'] = array(
'#type' => 'checkbox',
'#title' => t('Create new revision'),
'#default_value' => $new_revision_control_default_value,
'#access' => user_access('administer nodes'),
);
- $form['settings_summary']['revision_information']['log'] = array(
+ $form['settings_header']['revision_information']['log'] = array(
'#type' => 'textarea',
'#title' => t('Revision log message'),
'#rows' => 4,
@@ -182,6 +182,13 @@ public function form(array $form, array &$form_state, EntityInterface $node) {
),
);
+ /**
+ * Create the wrapper for additional node settings. Elements are added here
+ * by various modules using the `#group` Form API property.
+ *
+ * @todo Change this to a simple container (not `#type` details) once the
+ * `#group` property works for non-details elements.
+ */
$form['additional_settings'] = array(
'#type' => 'details',
'#weight' => 99,
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 5e86d8c..445cb56 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -503,7 +503,7 @@ details {
line-height: 1.295em;
}
details summary {
- padding: 12px 16px;
+ padding: 0.923em 1.231em;
}
details details {
background-color: #fff;
@@ -1404,46 +1404,46 @@ details.fieldset-no-legend {
/**
* Node add/edit screen
*/
-[id="edit-settings-summary"] {
+[id="edit-settings-header"] {
background-color: #f2f2f2;
border: 1px solid #a5a5a5;
margin-bottom: 0;
overflow: hidden;
padding: 0;
}
-[id="edit-settings-summary"] > .fieldset-wrapper {
- padding: 16px;
+[id="edit-settings-header"] > .fieldset-wrapper {
+ padding: 1.231em;
}
-[id="edit-settings-summary"] .label {
+[id="edit-settings-header"] .label {
font-weight: bold;
}
-[id="edit-settings-summary"] .form-item {
+[id="edit-settings-header"] .form-item {
font-size: 1em;
margin: 0;
padding: 0;
}
-[id="edit-settings-summary"] .form-item-log {
- margin-top: .5em;
+[id="edit-settings-header"] .form-item-log {
+ margin-top: 0.5em;
}
#edit-publish-state {
font-size: 1.231em;
font-weight: bold;
margin-bottom: 0;
- margin-top: .25em;
+ margin-top: 0.25em;
text-shadow: 0 1px 0 white;
}
-#edit-last-saved {
+[id="edit-last-saved"] {
font-style: italic;
- margin-bottom: .5em;
+ margin-bottom: 0.5em;
}
-#edit-last-saved .label {
+[id="edit-last-saved"] .label {
font-weight: normal;
}
.node-form-revision-information {
- padding: 0;
background: transparent;
- margin-bottom: .5em;
border: 0;
+ margin-bottom: 0.5em;
+ padding: 0;
}
.node-form-revision-information > .details-wrapper {
padding: 0;
@@ -1470,12 +1470,12 @@ details.fieldset-no-legend {
border-left: 0;
border-right: 0;
border-top: 1px solid white;
- padding-top: 0;
margin: 0;
+ padding-top: 0;
}
[id="edit-additional-settings"] details > summary {
+ padding: 0.846em 1.231em 0.923em 1.231em;
text-shadow: 0 1px 0 white;
- padding: 11px 16px 12px 16px;
}
[id="edit-additional-settings"] details > .details-wrapper {
padding-top: 0;
@@ -1498,14 +1498,14 @@ details.fieldset-no-legend {
border-top: 0 none;
padding-top: 1px;
}
-/* Force closed details elements to appear closed. */
-[id="edit-additional-settings"] .collapsed,
-[id="edit-additional-settings"] details:not([open]) {
- background-color: #f2f2f2 !important;
- background-image: none !important;
- border-bottom: 1px solid #a5a5a5 !important;
- border-top: 1px solid white !important;
- padding-top: 0 !important;
+/* Ensure closed details elements appear closed. */
+#edit-additional-settings .collapsed,
+#edit-additional-settings details:not([open]) {
+ background-color: #f2f2f2;
+ background-image: none;
+ border-bottom: 1px solid #a5a5a5;
+ border-top: 1px solid white;
+ padding-top: 0;
}
[id="edit-additional-settings"] details a {
color: #005e99;