commit 20f85f69624d1ff5768100e7ca0665efd6e89705 Author: HOG Date: Wed Jul 1 16:36:41 2015 +0300 2455211-70 diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml index 0689b22..1ed0d74 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml @@ -42,7 +42,7 @@ content: comment: label: above type: comment_default - weight: 20 + weight: 110 settings: pager_id: 0 third_party_settings: { } diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css index 9f22c51..cabf5d1 100644 --- a/core/themes/bartik/css/components/comments.css +++ b/core/themes/bartik/css/components/comments.css @@ -7,6 +7,9 @@ #content .comment-wrapper h2 { margin-bottom: 1em; } +.field-node--comment { + font-size: 0.934em; +} .comment { margin-bottom: 20px; display: table; diff --git a/core/themes/bartik/css/components/content.css b/core/themes/bartik/css/components/content.css index cf436e8..fc9326c 100644 --- a/core/themes/bartik/css/components/content.css +++ b/core/themes/bartik/css/components/content.css @@ -157,6 +157,9 @@ h1#page-title { .field-type-image a { border-bottom: none; } +.node__links { + font-size: 0.93em; +} ul.links { color: #68696b; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/core/themes/bartik/templates/links--node.html.twig b/core/themes/bartik/templates/links--node.html.twig new file mode 100644 index 0000000..96c1540 --- /dev/null +++ b/core/themes/bartik/templates/links--node.html.twig @@ -0,0 +1,43 @@ +{# +/** + * @file + * Bartik's theme implementation to display the node links. + * + * Available variables: + * - attributes: Attributes for the UL containing the list of links. + * - links: Links to be output. + * Each link will have the following elements: + * - title: The link text. + * - href: The link URL. If omitted, the 'title' is shown as a plain text + * item in the links list. If 'href' is supplied, the entire link is passed + * to l() as its $options parameter. + * - html: (optional) Whether or not 'title' is HTML. If set, the title will + * not be passed through \Drupal\Component\Utility\SafeMarkup::checkPlain(). + * - attributes: (optional) HTML attributes for the anchor, or for the + * tag if no 'href' is supplied. + * - link_key: The link CSS class. + * - heading: (optional) A heading to precede the links. + * - text: The heading text. + * - level: The heading level (e.g. 'h2', 'h3'). + * - attributes: (optional) A keyed list of attributes for the heading. + * If the heading is a string, it will be used as the text of the heading and + * the level will default to 'h2'. + * + * Headings should be used on navigation menus and any list of links that + * consistently appears on multiple pages. To make the heading invisible use + * the 'visually-hidden' CSS class. Do not use 'display:none', which + * removes it from screen readers and assistive technology. Headings allow + * screen reader and keyboard only users to navigate to or skip the links. + * See http://juicystudio.com/article/screen-readers-display-none.php and + * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information. + * + * @see template_preprocess_links() + * + * @ingroup themeable + */ +#} +{% if links %} + +{% endif %} diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig index 25144bf..6aa071d 100644 --- a/core/themes/bartik/templates/node.html.twig +++ b/core/themes/bartik/templates/node.html.twig @@ -92,10 +92,6 @@ {% endif %} - {{ content|without('comment', 'links') }} + {{ content }} - {% if content.links %} - - {% endif %} - {{ content.comment }}