diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 009bb33..5e116d2 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -45,6 +45,11 @@
*/
const MARK_UPDATED = 2;
+ /**
+ * Mark content as being updated.
+ */
+const MARK_UNPUBLISHED = 3;
+
/**
* A responsive table class; hide table cell on narrow devices.
*
@@ -1722,6 +1727,7 @@ function drupal_common_theme() {
),
'mark' => array(
'variables' => array('status' => MARK_NEW),
+ 'template' => 'mark',
),
'item_list' => array(
'variables' => array('items' => array(), 'title' => '', 'list_type' => 'ul', 'attributes' => array(), 'empty' => NULL, 'context' => array()),
diff --git a/core/modules/system/css/components/form.theme.css b/core/modules/system/css/components/form.theme.css
index c548900..6013efa 100644
--- a/core/modules/system/css/components/form.theme.css
+++ b/core/modules/system/css/components/form.theme.css
@@ -61,9 +61,6 @@ label.option {
.form-type-checkbox .description {
margin-left: 2.4em;
}
-.marker {
- color: #e00;
-}
.form-required:after {
content: '';
vertical-align: super;
diff --git a/core/modules/system/templates/mark.html.twig b/core/modules/system/templates/mark.html.twig
index 6da921a..90cb3bf 100644
--- a/core/modules/system/templates/mark.html.twig
+++ b/core/modules/system/templates/mark.html.twig
@@ -9,6 +9,7 @@
* - MARK_NEW
* - MARK_UPDATED
* - MARK_READ
+ * - MARK_UNPUBLISHED
*
* @ingroup themeable
*/
@@ -18,5 +19,7 @@
{{ 'new'|t }}
{% elseif status is constant('MARK_UPDATED') %}
{{ 'updated'|t }}
+ {% elseif status is constant('MARK_UNPUBLISHED') %}
+ {{ 'unpublished'|t }}
{% endif %}
{% endif %}
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 4f83a9e..c8cf771 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -62,6 +62,21 @@ function bartik_preprocess_page(&$variables) {
}
}
+ /**
+ * Implements hook_process_HOOK() for comment.html.twig.
+ *
+ * Override or insert variables into the comment template.
+ */
+ function bartik_preprocess_comment(&$variables) {
+ if ($variables['status'] == 'unpublished') {
+ $mark_build = array(
+ '#theme' => 'mark',
+ '#status' => MARK_UNPUBLISHED,
+ );
+ $variables['unpublished'] = drupal_render($mark_build);
+ }
+ }
+
/**
* Implements hook_preprocess_HOOK() for maintenance-page.html.twig.
*/
@@ -90,6 +105,16 @@ function bartik_preprocess_node(&$variables) {
if ($variables['teaser'] || !empty($variables['content']['comments']['comment_form'])) {
unset($variables['content']['links']['comment']['#links']['comment-add']);
}
+
+ $status = (isset($variables['status'])) ? $variables['status'] : 0;
+ // Add an unpublished mark to unpublished nodes.
+ if (!$status && !isset($variables['preview'])) {
+ $mark_build = array(
+ '#theme' => 'mark',
+ '#status' => MARK_UNPUBLISHED,
+ );
+ $variables['unpublished'] = drupal_render($mark_build);
+ }
}
/**
diff --git a/core/themes/bartik/css/components/node.css b/core/themes/bartik/css/components/node.css
index dcf4ac0..137ab8c 100644
--- a/core/themes/bartik/css/components/node.css
+++ b/core/themes/bartik/css/components/node.css
@@ -61,8 +61,33 @@
/* Unpublished node styles. */
.node--unpublished {
padding: 20px 15px 0;
+ box-shadow: 0 -8px 0 #d8d8d8;
+ z-index: 0;
}
.node--unpublished .comment-text .comment-arrow {
border-left: 1px solid #fff4f4;
border-right: 1px solid #fff4f4;
}
+.node-preview div.unpublished {
+ display: none;
+}
+.preview .comment div.unpublished {
+ display: none;
+}
+.marker {
+ color: #d8d8d8;
+ font-family: Impact,"Arial Narrow",Helvetica,sans-serif;
+ font-size: 75px;
+ font-weight: bold;
+ height: 0;
+ line-height: 1;
+ overflow: visible;
+ text-transform: uppercase;
+ word-wrap: break-word;
+ float: right;
+ position: relative;
+ left: -50%;
+ text-align: left;
+ z-index: -1;
+}
+
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 8927db4..0e0293c 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -84,7 +84,7 @@
indicator here would break the render cache.
#}
-
+ {{ unpublished }}