Commit 134aba99 authored by xjm's avatar xjm

Issue #2501903 by pguillard, Manjit.Singh: inline form errors classnames to follow namestandard

parent 782dfb3c
...@@ -114,7 +114,7 @@ abbr.ajax-changed { ...@@ -114,7 +114,7 @@ abbr.ajax-changed {
} }
/* Inline error messages. */ /* Inline error messages. */
.form-error-message:before { .form-item--error-message:before {
content: ''; content: '';
display: inline-block; display: inline-block;
height: 14px; height: 14px;
......
...@@ -188,7 +188,7 @@ function testRequiredCheckboxesRadio() { ...@@ -188,7 +188,7 @@ function testRequiredCheckboxesRadio() {
} }
// Check the page for error messages. // Check the page for error messages.
$errors = $this->xpath('//div[contains(@class, "form-error-message")]//strong'); $errors = $this->xpath('//div[contains(@class, "form-item--error-message")]//strong');
foreach ($errors as $error) { foreach ($errors as $error) {
$expected_key = array_search($error[0], $expected); $expected_key = array_search($error[0], $expected);
// If the error message is not one of the expected messages, fail. // If the error message is not one of the expected messages, fail.
......
...@@ -276,7 +276,7 @@ function testCustomRequiredError() { ...@@ -276,7 +276,7 @@ function testCustomRequiredError() {
* - key: The key used for the form element. * - key: The key used for the form element.
*/ */
protected function assertErrorMessages($messages) { protected function assertErrorMessages($messages) {
$element = $this->xpath('//div[@class = "form-error-message"]/strong'); $element = $this->xpath('//div[@class = "form-item--error-message"]/strong');
$this->assertIdentical(count($messages), count($element)); $this->assertIdentical(count($messages), count($element));
$error_links = []; $error_links = [];
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
'form-item-' ~ name|clean_class, 'form-item-' ~ name|clean_class,
title_display not in ['after', 'before'] ? 'form-no-label', title_display not in ['after', 'before'] ? 'form-no-label',
disabled == 'disabled' ? 'form-disabled', disabled == 'disabled' ? 'form-disabled',
errors ? 'form-error', errors ? 'form-item--error',
] ]
%} %}
{% {%
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
{{ label }} {{ label }}
{% endif %} {% endif %}
{% if errors %} {% if errors %}
<div class="form-error-message"> <div class="form-item--error-message">
{{ errors }} {{ errors }}
</div> </div>
{% endif %} {% endif %}
......
...@@ -276,6 +276,6 @@ input.form-submit:focus { ...@@ -276,6 +276,6 @@ input.form-submit:focus {
} }
/* Form error message styles. */ /* Form error message styles. */
.form-error-message { .form-item--error-message {
color: #ea2800; color: #ea2800;
} }
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
{% endif %} {% endif %}
{{ content }} {{ content }}
{% if errors %} {% if errors %}
<div class="form-error-message"> <div class="form-item--error-message">
<strong>{{ errors }}</strong> <strong>{{ errors }}</strong>
</div> </div>
{% endif %} {% endif %}
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</legend> </legend>
<div class="fieldset-wrapper"> <div class="fieldset-wrapper">
{% if errors %} {% if errors %}
<div class="form-error-message"> <div class="form-item--error-message">
<strong>{{ errors }}</strong> <strong>{{ errors }}</strong>
</div> </div>
{% endif %} {% endif %}
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
'form-item-' ~ name|clean_class, 'form-item-' ~ name|clean_class,
title_display not in ['after', 'before'] ? 'form-no-label', title_display not in ['after', 'before'] ? 'form-no-label',
disabled == 'disabled' ? 'form-disabled', disabled == 'disabled' ? 'form-disabled',
errors ? 'form-error', errors ? 'form-item--error',
] ]
%} %}
{% {%
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
{{ label }} {{ label }}
{% endif %} {% endif %}
{% if errors %} {% if errors %}
<div class="form-error-message"> <div class="form-item--error-message">
<strong>{{ errors }}</strong> <strong>{{ errors }}</strong>
</div> </div>
{% endif %} {% endif %}
......
...@@ -96,14 +96,14 @@ label[for] { ...@@ -96,14 +96,14 @@ label[for] {
width: 7px; width: 7px;
height: 7px; height: 7px;
} }
.form-error-message { .form-item--error-message {
margin-top: 0.15em; margin-top: 0.15em;
color: #ea2800; color: #ea2800;
} }
.fieldset-wrapper > .form-error-message { .fieldset-wrapper > .form-item--error-message {
margin-top: 0; margin-top: 0;
} }
.text-format-wrapper .form-error-message { .text-format-wrapper .form-item--error-message {
border: solid #ccc; border: solid #ccc;
border-width: 0 1px; border-width: 0 1px;
margin: 0; margin: 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment