summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-09-22 09:41:15 (GMT)
committerAlex Pott2015-09-22 09:41:15 (GMT)
commite2f57055c33347fa4b36764fedd81997aa789440 (patch)
treecf7f0085df4cb7bd52d7b38c25a190d6171b6956
parentb19760f2e3b88e95ef5e90eccdfaae6a67d0e87d (diff)
Issue #2455211 by nlisgo, haasontwerp, andypost, HOG, emma.maria, Manjit.Singh, davidhernandez: Comment field displayed last regardless of assigned weight
-rw-r--r--core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml2
-rw-r--r--core/themes/bartik/css/components/comments.css3
-rw-r--r--core/themes/bartik/css/components/node.css1
-rw-r--r--core/themes/bartik/templates/node.html.twig6
-rw-r--r--core/themes/classy/templates/content/links--node.html.twig41
-rw-r--r--core/themes/classy/templates/content/node.html.twig8
6 files changed, 48 insertions, 13 deletions
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 03bbfd1..c0c0c92 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -10,6 +10,9 @@
#content .comment-wrapper h2.comment-form__title {
margin-bottom: 1em;
}
+.field-node--comment {
+ font-size: 0.934em;
+}
.comment {
margin-bottom: 19px;
vertical-align: top;
diff --git a/core/themes/bartik/css/components/node.css b/core/themes/bartik/css/components/node.css
index e57a686..78caa34 100644
--- a/core/themes/bartik/css/components/node.css
+++ b/core/themes/bartik/css/components/node.css
@@ -53,6 +53,7 @@
/* Node links styles. */
.node__links {
text-align: right; /* LTR */
+ font-size: 0.93em;
}
[dir="rtl"] .node__links {
text-align: left;
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index 7231922..754b670 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -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>
diff --git a/core/themes/classy/templates/content/links--node.html.twig b/core/themes/classy/templates/content/links--node.html.twig
new file mode 100644
index 0000000..f4c3d72
--- /dev/null
+++ b/core/themes/classy/templates/content/links--node.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override to display 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.
+ * - attributes: (optional) HTML attributes for the anchor, or for the <span>
+ * 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 %}
+ <div class="node__links">
+ {% include "links.html.twig" %}
+ </div>
+{% endif %}
diff --git a/core/themes/classy/templates/content/node.html.twig b/core/themes/classy/templates/content/node.html.twig
index 6afe7b5..dbef76d 100644
--- a/core/themes/classy/templates/content/node.html.twig
+++ b/core/themes/classy/templates/content/node.html.twig
@@ -97,13 +97,7 @@
{% endif %}
<div{{ content_attributes.addClass('node__content') }}>
- {{ content|without('links') }}
+ {{ content }}
</div>
- {% if content.links %}
- <div class="node__links">
- {{ content.links }}
- </div>
- {% endif %}
-
</article>