commit 5256f5e9e69cabb61f152d9f722d6adf53ff7eef Author: Joel Pittet Date: Sat Apr 26 11:20:30 2014 -0600 missed classes and changes diff --git a/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php b/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php index 723b72e..0282c93 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php @@ -61,7 +61,7 @@ function testPagePostInfo() { $this->drupalPostForm('node/add/page', $edit, t('Save')); // Check that the post information is displayed. - $elements = $this->xpath('//*[contains(@class,:class)]', array(':class' => 'node__meta')); + $elements = $this->xpath('//*[contains(@class, :class)]', array(':class' => 'node__meta')); $this->assertEqual(count($elements), 0, 'Post information is not displayed.'); } } diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 197a79a..764abf4 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -586,7 +586,7 @@ function node_is_page(NodeInterface $node) { function node_preprocess_html(&$variables) { // If on an individual node page, add the node type to body classes. if (($node = \Drupal::request()->attributes->get('node')) && $node instanceof NodeInterface) { - $variables['attributes']['class'][] = drupal_html_class('node-type-' . $node->getType()); + $variables['attributes']['class'][] = drupal_html_class('node--type-' . $node->getType()); } } diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 4447052..6c33ea0 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -1323,7 +1323,7 @@ function hook_mail($key, &$message, $params) { $node = $params['node']; $variables += array( '%uid' => $node->getOwnerId(), - '%node_url' => url('node/' . $node->id(), array('absolute' => TRUE)), + '%url' => url('node/' . $node->id(), array('absolute' => TRUE)), '%node_type' => node_get_type_label($node), '%title' => $node->getTitle(), '%teaser' => $node->teaser, diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 6ed3fda..0207e8f 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -657,7 +657,8 @@ h1.site-name { /* ----------------- Content ------------------ */ -.content { +.content, +.node__content { margin-top: 10px; } h1#page-title { @@ -727,8 +728,8 @@ h1#page-title { .field-type-taxonomy-term-reference ul.links { font-size: 0.8em; } -.view-mode-teaser .field-type-taxonomy-term-reference .field-label, -.view-mode-teaser .field-type-taxonomy-term-reference ul.links { +.node--view-mode-teaser .field-type-taxonomy-term-reference .field-label, +.node--view-mode-teaser .field-type-taxonomy-term-reference ul.links { font-size: 0.821em; } .field-type-taxonomy-term-reference ul.links { @@ -761,10 +762,12 @@ ul.links { color: #68696b; font-size: 0.821em; } +.node--unpublished, .unpublished { margin: -20px -15px 0; padding: 20px 15px 0; } +.node--unpublished .comment-text .comment-arrow, .unpublished .comment-text .comment-arrow { border-left: 1px solid #fff4f4; border-right: 1px solid #fff4f4; diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 33b3eee..7bd88fd 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -515,7 +515,7 @@ ul.admin-list { .admin-list li a:active .label { text-decoration: underline; } -div.submitted { +.node__meta { color: #898989; }