Update to Drupal 8.0.0-beta15. For more information, see: https://www.drupal.org/node/2563023

core/themes/classy/classy.libraries.yml

@@ -16,6 +16,12 @@ drupal.comment.threaded:
     theme:
       css/comment/comment.theme.css: {}
 
+node:
+  version: VERSION
+  css:
+    component:
+      css/components/node.css: { weight: -10 }
+
 search.results:
   version: VERSION
   css:

core/themes/classy/css/components/node.css

@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Visual styles for nodes.
+ */
+
+.node--unpublished {
+  background-color: #fff4f4;
+}

core/themes/classy/templates/block/block--local-actions-block.html.twig

@@ -0,0 +1,12 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for local actions (primary admin actions.)
+ */
+#}
+{% block content %}
+  {% if content %}
+    <nav class="action-links">{{ content }}</nav>
+  {% endif %}
+{% endblock %}

core/themes/classy/templates/block/block--local-tasks-block.html.twig

@@ -0,0 +1,14 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for tabs.
+ */
+#}
+{% block content %}
+  {% if content %}
+    <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
+      {{ content }}
+    </nav>
+  {% endif %}
+{% endblock %}

core/themes/classy/templates/block/block--search-form-block.html.twig

@@ -12,12 +12,6 @@
  *   - module: The module that provided this block plugin.
  *   - cache: The cache settings.
  *   - Block plugin specific settings will also be stored here.
- * - block - The full block entity, including:
- *   - label_hidden: The hidden block title value if the block was
- *     configured to hide the title ('label' is empty in this case).
- *   - module: The module that generated the block.
- *   - delta: An ID for the block, unique within each module.
- *   - region: The block region embedding the current block.
  * - content: The content of this block.
  * - attributes: A list HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template. Includes:

core/themes/classy/templates/block/block--system-menu-block.html.twig

@@ -12,12 +12,6 @@
  *   - module: The module that provided this block plugin.
  *   - cache: The cache settings.
  *   - Block plugin specific settings will also be stored here.
- * - block - The full block entity.
- *   - label_hidden: The hidden block title value if the block was
- *     configured to hide the title ('label' is empty in this case).
- *   - module: The module that generated the block.
- *   - delta: An ID for the block, unique within each module.
- *   - region: The block region embedding the current block.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.

core/themes/classy/templates/block/block.html.twig

@@ -12,12 +12,6 @@
  *   - module: The module that provided this block plugin.
  *   - cache: The cache settings.
  *   - Block plugin specific settings will also be stored here.
- * - block - The full block entity.
- *   - label_hidden: The hidden block title value if the block was
- *     configured to hide the title ('label' is empty in this case).
- *   - module: The module that generated the block.
- *   - delta: An ID for the block, unique within each module.
- *   - region: The block region embedding the current block.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
@@ -36,6 +30,7 @@
   set classes = [
     'block',
     'block-' ~ configuration.provider|clean_class,
+    'block-' ~ plugin_id|clean_class,
   ]
 %}
 <div{{ attributes.addClass(classes) }}>

core/themes/classy/templates/content/node.html.twig

@@ -75,6 +75,7 @@
     view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
   ]
 %}
+{{ attach_library('classy/node') }}
 <article{{ attributes.addClass(classes) }}>
 
   {{ title_prefix }}

core/themes/classy/templates/dataset/item-list.html.twig

@@ -12,10 +12,15 @@
  * - attributes: HTML attributes to be applied to the list.
  * - empty: A message to display when there are no items. Allowed value is a
  *   string or render array.
+ * - context: A list of contextual data associated with the list. May contain:
+ *   - list_style: The custom list style.
  *
  * @see template_preprocess_item_list()
  */
 #}
+{% if context.list_style %}
+  {% set attributes = attributes.addClass('item-list__' ~ context.list_style) %}
+{% endif %}
 {%- if items or empty -%}
   <div class="item-list">
     {%- if title is not empty -%}

core/themes/classy/templates/field/field--comment.html.twig

@@ -13,7 +13,6 @@
  * - title_suffix: Additional title output populated by modules, intended to
  *   be displayed after the main title tag that appears in the template.
  * - comments: List of comments rendered through comment.html.twig.
- * - content_attributes: HTML attributes for the form title.
  * - comment_form: The 'Add new comment' form.
  * - comment_display_mode: Is the comments are threaded.
  * - comment_type: The comment type bundle ID for the comment field.
@@ -26,15 +25,12 @@
  * @see comment_preprocess_field()
  */
 #}
-{% set field_name_class = field_name|clean_class %}
 {%
   set classes = [
     'field',
-    'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
-    'field-name-' ~ field_name_class,
-    'field-type-' ~ field_type|clean_class,
-    'field-label-' ~ label_display,
-    label_display == 'inline' ? 'clearfix',
+    'field--name-' ~ field_name|clean_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
     'comment-wrapper',
   ]
 %}
@@ -54,7 +50,7 @@
   {{ comments }}
 
   {% if comment_form %}
-    <h2{{ content_attributes.addClass('title', 'comment-form__title') }}>{{ 'Add new comment'|t }}</h2>
+    <h2 class='title comment-form__title'>{{ 'Add new comment'|t }}</h2>
     {{ comment_form }}
   {% endif %}
 

core/themes/classy/templates/field/field--node--created.html.twig

@@ -19,14 +19,12 @@
  * @see field.html.twig
  */
 #}
-{% set field_name_class = field_name|clean_class %}
 {%
   set classes = [
     'field',
-    'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
-    'field-name-' ~ field_name_class,
-    'field-type-' ~ field_type|clean_class,
-    'field-label-' ~ label_display,
+    'field--name-' ~ field_name|clean_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
   ]
 %}
 <span{{ attributes.addClass(classes) }}>

core/themes/classy/templates/field/field--node--title.html.twig

@@ -19,14 +19,12 @@
  * @see field.html.twig
  */
 #}
-{% set field_name_class = field_name|clean_class %}
 {%
   set classes = [
     'field',
-    'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
-    'field-name-' ~ field_name_class,
-    'field-type-' ~ field_type|clean_class,
-    'field-label-' ~ label_display,
+    'field--name-' ~ field_name|clean_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
   ]
 %}
 <span{{ attributes.addClass(classes) }}>

core/themes/classy/templates/field/field--node--uid.html.twig

@@ -19,14 +19,12 @@
  * @see field.html.twig
  */
 #}
-{% set field_name_class = field_name|clean_class %}
 {%
   set classes = [
     'field',
-    'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
-    'field-name-' ~ field_name_class,
-    'field-type-' ~ field_type|clean_class,
-    'field-label-' ~ label_display,
+    'field--name-' ~ field_name_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
   ]
 %}
 <span{{ attributes.addClass(classes) }}>

core/themes/classy/templates/field/field.html.twig

@@ -24,7 +24,7 @@
  * - label_hidden: Whether to show the field label or not.
  * - title_attributes: HTML attributes for the title.
  * - label: The label for the field.
- * - content_attributes: HTML attributes for the content.
+ * - multiple: TRUE if a field can contain multiple items.
  * - items: List of all the field items. Each item contains:
  *   - attributes: List of HTML attributes for each item.
  *   - content: The field item's content.
@@ -33,33 +33,48 @@
  * - field_type: The type of the field.
  * - label_display: The display settings for the label.
  *
+ *
  * @see template_preprocess_field()
  */
 #}
-{% set field_name_class = field_name|clean_class %}
 {%
   set classes = [
     'field',
-    'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
-    'field-name-' ~ field_name_class,
-    'field-type-' ~ field_type|clean_class,
-    'field-label-' ~ label_display,
-    label_display == 'inline' ? 'clearfix',
+    'field--name-' ~ field_name|clean_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
   ]
 %}
 {%
   set title_classes = [
-    'field-label',
+    'field__label',
     label_display == 'visually_hidden' ? 'visually-hidden',
   ]
 %}
-<div{{ attributes.addClass(classes) }}>
-  {% if not label_hidden %}
-    <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
-  {% endif %}
-  <div{{ content_attributes.addClass('field-items') }}>
+
+{% if label_hidden %}
+  {% if multiple %}
+    <div{{ attributes.addClass(classes, 'field__items') }}>
+      {% for item in items %}
+        <div{{ item.attributes.addClass(classes, 'field__item') }}>{{ item.content }}</div>
+      {% endfor %}
+    </div>
+  {% else %}
     {% for item in items %}
-      <div{{ item.attributes.addClass('field-item') }}>{{ item.content }}</div>
+      <div{{ attributes.addClass(classes, 'field__item') }}>{{ item.content }}</div>
     {% endfor %}
+  {% endif %}
+{% else %}
+  <div{{ attributes.addClass(classes) }}>
+    <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
+    {% if multiple %}
+      <div class='field__items'>
+    {% endif %}
+    {% for item in items %}
+      <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+    {% endfor %}
+    {% if multiple %}
+      </div>
+    {% endif %}
   </div>
-</div>
+{% endif %}

core/themes/classy/templates/form/datetime-wrapper.html.twig

@@ -16,6 +16,7 @@
 {%
   set title_classes = [
     'label',
+    required ? 'js-form-required',
     required ? 'form-required',
   ]
 %}

core/themes/classy/templates/form/fieldset.html.twig

@@ -31,6 +31,7 @@
   {%
     set legend_span_classes = [
       'fieldset-legend',
+      required ? 'js-form-required',
       required ? 'form-required',
     ]
   %}

core/themes/classy/templates/form/form-element-label.html.twig

@@ -16,6 +16,7 @@
   set classes = [
     title_display == 'after' ? 'option',
     title_display == 'invisible' ? 'visually-hidden',
+    required ? 'js-form-required',
     required ? 'form-required',
   ]
 %}

core/themes/classy/templates/layout/html.html.twig

@@ -19,9 +19,10 @@
  * - page: The rendered page markup.
  * - page_bottom: Closing rendered markup. This variable should be printed after
  *   'page'.
- * - styles: Style tags necessary to import all necessary CSS files in the head.
- * - scripts: Script tags necessary to load the JavaScript files and settings
- *   in the head.
+ * - styles: HTML necessary to import all necessary CSS files in <head>.
+ * - scripts: HTML necessary to load JavaScript files and settings in <head>.
+ * - scripts_bottom: HTML necessary to load JavaScript files before closing
+ *   <body> tag.
  * - db_offline: A flag indicating if the database is offline.
  *
  * @see template_preprocess_html()

core/themes/classy/templates/layout/page.html.twig

@@ -31,10 +31,6 @@
  * - title: The page title, for use in the actual content.
  * - title_suffix: Additional output populated by modules, intended to be
  *   displayed after the main title tag that appears in the template.
- * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
- *   view and edit tabs when displaying a node).
- * - action_links: Actions local to the page, such as "Add menu" on the menu
- *   administration interface.
  * - node: Fully loaded node, if there is an automatically-loaded node
  *   associated with the page and the node ID is the second argument in the
  *   page's path (e.g. node/12345 and node/12345/revisions, but not
@@ -109,13 +105,6 @@
         <h1>{{ title }}</h1>
       {% endif %}
       {{ title_suffix }}
-
-      {{ tabs }}
-
-      {% if action_links %}
-        <nav class="action-links">{{ action_links }}</nav>
-      {% endif %}
-
       {{ page.content }}
     </div>{# /.layout-content #}
 

core/themes/classy/templates/navigation/toolbar.html.twig

@@ -23,23 +23,24 @@
 <div{{ attributes.addClass('toolbar') }}>
   <nav{{ toolbar_attributes.addClass('toolbar-bar', 'clearfix') }}>
     <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
-    {% for tab in tabs %}
-      <div{{ tab.attributes.addClass('toolbar-tab') }}>{{ tab.link }}</div>
+    {% for key, tab in tabs %}
+      {% set tray = trays[key] %}
+      <div{{ tab.attributes.addClass('toolbar-tab') }}>
+        {{ tab.link }}
+        {% spaceless %}
+          <div{{ tray.attributes }}>
+            {% if tray.label %}
+              <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
+                <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
+            {% else %}
+              <nav class="toolbar-lining clearfix" role="navigation">
+            {% endif %}
+            {{ tray.links }}
+            </nav>
+          </div>
+        {% endspaceless %}
+      </div>
     {% endfor %}
   </nav>
-  {% for tray in trays %}
-    {% spaceless %}
-    <div{{ tray.attributes }}>
-    {% if tray.label %}
-      <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
-          <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
-    {% else %}
-      <nav class="toolbar-lining clearfix" role="navigation">
-    {% endif %}
-        {{ tray.links }}
-      </nav>
-    </div>
-    {% endspaceless %}
-  {% endfor %}
   {{ remainder }}
 </div>

core/themes/classy/templates/views/views-view-table.html.twig

@@ -72,7 +72,21 @@
             %}
           {% endif %}
           <th{{ column.attributes.addClass(column_classes).setAttribute('scope', 'col') }}>
-            {{ column.content }}
+            {%- if column.wrapper_element -%}
+              <{{ column.wrapper_element }}>
+                {%- if column.url -%}
+                  <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+                {%- else -%}
+                  {{ column.content }}{{ column.sort_indicator }}
+                {%- endif -%}
+              </{{ column.wrapper_element }}>
+            {%- else -%}
+              {%- if column.url -%}
+                <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+              {%- else -%}
+                {{- column.content }}{{ column.sort_indicator }}
+              {%- endif -%}
+            {%- endif -%}
           </th>
         {% endfor %}
       </tr>
@@ -93,7 +107,17 @@
             {% endfor %}
           {% endif %}
           <td{{ column.attributes.addClass(column_classes) }}>
-            {{ column.content }}
+            {%- if column.wrapper_element -%}
+              <{{ column.wrapper_element }}>
+              {% for content in column.content %}
+                {{ content.separator }}{{ content.field_output }}
+              {% endfor %}
+              </{{ column.wrapper_element }}>
+            {%- else -%}
+              {% for content in column.content %}
+                {{- content.separator }}{{ content.field_output -}}
+              {% endfor %}
+            {%- endif %}
           </td>
         {% endfor %}
       </tr>