Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663
This commit is contained in:
parent
eb34d130a8
commit
f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
|
@ -13,21 +13,22 @@
|
|||
* - site_slogan: Slogan for site as defined in Site information settings.
|
||||
*/
|
||||
#}
|
||||
{% set attributes = attributes.addClass('site-branding') %}
|
||||
{% block content %}
|
||||
{% if site_logo %}
|
||||
<a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="site-logo">
|
||||
<a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="site-branding__logo">
|
||||
<img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if site_name or site_slogan %}
|
||||
<div class="site-branding-text">
|
||||
<div class="site-branding__text">
|
||||
{% if site_name %}
|
||||
<strong class="site-name">
|
||||
<a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
|
||||
</strong>
|
||||
<div class="site-branding__name">
|
||||
<a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if site_slogan %}
|
||||
<div class="site-slogan">{{ site_slogan }}</div>
|
||||
<div class="site-branding__slogan">{{ site_slogan }}</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
{#
|
||||
/**
|
||||
* @file
|
||||
* Default theme implementation for a 'form' element.
|
||||
*
|
||||
* Available variables:
|
||||
* - attributes: A list of HTML attributes for the wrapper element.
|
||||
* - children: The child elements of the form.
|
||||
*
|
||||
* @see template_preprocess_form()
|
||||
*/
|
||||
#}
|
||||
<form{{ attributes.addClass('search-form', 'search-block-form') }}>
|
||||
{{ children }}
|
||||
</form>
|
|
@ -93,10 +93,6 @@
|
|||
{% endif %}
|
||||
</header>
|
||||
<div{{ content_attributes.addClass('node__content', 'clearfix') }}>
|
||||
{{ content|without('comment', 'links') }}
|
||||
{{ content }}
|
||||
</div>
|
||||
{% if content.links %}
|
||||
<div class="node__links">{{ content.links }}</div>
|
||||
{% endif %}
|
||||
{{ content.comment }}
|
||||
</article>
|
||||
|
|
16
core/themes/bartik/templates/page-title.html.twig
Normal file
16
core/themes/bartik/templates/page-title.html.twig
Normal file
|
@ -0,0 +1,16 @@
|
|||
{% extends "@classy/content/page-title.html.twig" %}
|
||||
{#
|
||||
/**
|
||||
* @file
|
||||
* Bartik's theme implementation for a page title.
|
||||
*
|
||||
* Available variables:
|
||||
* - title_attributes: HTML attributes for the page title element.
|
||||
* - title_prefix: Additional output populated by modules, intended to be
|
||||
* displayed in front of the main title tag that appears in the template.
|
||||
* - 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.
|
||||
*/
|
||||
#}
|
||||
{% set title_attributes = title_attributes.addClass('title') %}
|
|
@ -25,19 +25,8 @@
|
|||
* name has been disabled in the theme settings.
|
||||
* - site_slogan: The slogan of the site. This is empty when displaying the site
|
||||
* slogan has been disabled in theme settings.
|
||||
* - hide_site_name: A flag indicating if the site name has been toggled off on
|
||||
* the theme settings page. If hidden, the "visually-hidden" class is added
|
||||
* to make the site name visually hidden, but still accessible.
|
||||
* - hide_site_slogan: A flag indicating if the site slogan has been toggled off
|
||||
* on the theme settings page. If hidden, the "visually-hidden" class is
|
||||
* added to make the site slogan visually hidden, but still accessible.
|
||||
*
|
||||
|
||||
* Page content (in order of occurrence in the default page.html.twig):
|
||||
* - title_prefix: Additional output populated by modules, intended to be
|
||||
* displayed in front of the main title tag that appears in the template.
|
||||
* - 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.
|
||||
* - 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
|
||||
|
@ -72,34 +61,6 @@
|
|||
<header id="header" class="header" role="banner" aria-label="{{ 'Site header'|t}}">
|
||||
<div class="section layout-container clearfix">
|
||||
{{ page.secondary_menu }}
|
||||
{% if logo %}
|
||||
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
|
||||
<img src="{{ logo }}" alt="{{ 'Home'|t }}" />
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if site_name or site_slogan %}
|
||||
<div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
|
||||
{% if site_name %}
|
||||
{% if title %}
|
||||
<div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
|
||||
<strong>
|
||||
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
|
||||
</strong>
|
||||
</div>
|
||||
{# Use h1 when the content title is empty #}
|
||||
{% else %}
|
||||
<h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
|
||||
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
|
||||
</h1>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if site_slogan %}
|
||||
<div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
|
||||
{{ site_slogan }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{{ page.header }}
|
||||
{{ page.primary_menu }}
|
||||
</div>
|
||||
|
@ -124,13 +85,6 @@
|
|||
<main id="content" class="column main-content" role="main">
|
||||
<section class="section">
|
||||
<a id="main-content" tabindex="-1"></a>
|
||||
{{ title_prefix }}
|
||||
{% if title %}
|
||||
<h1 class="title page-title">
|
||||
{{ title }}
|
||||
</h1>
|
||||
{% endif %}
|
||||
{{ title_suffix }}
|
||||
{{ page.content }}
|
||||
</section>
|
||||
</main>
|
||||
|
|
16
core/themes/bartik/templates/region--header.html.twig
Normal file
16
core/themes/bartik/templates/region--header.html.twig
Normal file
|
@ -0,0 +1,16 @@
|
|||
{% extends "region.html.twig" %}
|
||||
{#
|
||||
/**
|
||||
* @file
|
||||
* Bartik's theme implementation to display a header region.
|
||||
*
|
||||
* Available variables:
|
||||
* - content: The content for this region, typically blocks.
|
||||
* - attributes: HTML attributes for the region div.
|
||||
* - region: The name of the region variable as defined in the theme's
|
||||
* .info.yml file.
|
||||
*
|
||||
* @see template_preprocess_region()
|
||||
*/
|
||||
#}
|
||||
{% set attributes = attributes.addClass('clearfix') %}
|
|
@ -25,10 +25,8 @@
|
|||
{% block messages %}
|
||||
{% if message_list is not empty %}
|
||||
{{ attach_library('bartik/messages') }}
|
||||
<div id="messages">
|
||||
<div class="section clearfix">
|
||||
{{ parent() }}
|
||||
</div>
|
||||
<div class="messages__wrapper layout-container">
|
||||
{{ parent() }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock messages %}
|
||||
|
|
Reference in a new issue