diff --git a/core/includes/form.inc b/core/includes/form.inc
index 7498ea5..d473c9f 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -3790,7 +3790,7 @@ function theme_vertical_tabs($variables) {
// Add required JavaScript and Stylesheet.
drupal_add_library('system', 'drupal.vertical-tabs');
- $output = '
' . t('Vertical Tabs') . '
';
+ $output = '
' . t('Vertical Tabs') . '
';
$output .= '
' . $element['#children'] . '
';
return $output;
}
@@ -4524,7 +4524,7 @@ function theme_form_element_label($variables) {
}
// Show label only to screen readers to avoid disruption in visual flows.
elseif ($element['#title_display'] == 'invisible') {
- $attributes['class'] = 'element-invisible';
+ $attributes['class'] = 'visuallyhidden';
}
if (!empty($element['#id'])) {
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 2fd7b52..ada6bd3 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1621,7 +1621,7 @@ function theme_menu_local_task($variables) {
if (!empty($variables['element']['#active'])) {
// Add text to indicate active tab for non-visual users.
- $active = '' . t('(active tab)') . '';
+ $active = '' . t('(active tab)') . '';
// If the link does not contain HTML already, check_plain() it now.
// After we set 'html'=TRUE the link will not be sanitized by l().
@@ -2231,13 +2231,13 @@ function theme_menu_local_tasks(&$variables) {
$output = '';
if (!empty($variables['primary'])) {
- $variables['primary']['#prefix'] = '
\n";
if (!empty($status_heading[$type])) {
- $output .= '
' . $status_heading[$type] . "
\n";
+ $output .= '
' . $status_heading[$type] . "
\n";
}
if (count($messages) > 1) {
$output .= "
\n";
@@ -1609,7 +1609,7 @@ function theme_link($variables) {
* When using 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 'element-invisible' CSS class. Do not
+ * make the heading invisible use the 'visuallyhidden' 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
@@ -1747,8 +1747,8 @@ function theme_breadcrumb($variables) {
if (!empty($breadcrumb)) {
$output .= '';
}
diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc
index 52b6c40..c37a6ee 100644
--- a/core/includes/theme.maintenance.inc
+++ b/core/includes/theme.maintenance.inc
@@ -110,7 +110,7 @@ function theme_task_list($variables) {
$active = $variables['active'];
$done = isset($items[$active]) || $active == NULL;
- $output = '
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php
index 7fcc45f..fa13daa 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php
@@ -65,8 +65,8 @@ class ElementsLabelsTest extends WebTestBase {
$elements = $this->xpath('//input[@id="edit-form-textfield-test-no-title-required"]/preceding-sibling::label[@for="edit-form-textfield-test-no-title-required"]/abbr[@class="form-required"]');
$this->assertTrue(isset($elements[0]), t("Label tag with required marker precedes required textfield with no title."));
- $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/preceding-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="element-invisible"]');
- $this->assertTrue(isset($elements[0]), t("Label preceding field and label class is element-invisible."));
+ $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/preceding-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="visuallyhidden"]');
+ $this->assertTrue(isset($elements[0]), t("Label preceding field and label class is visuallyhidden."));
$elements = $this->xpath('//input[@id="edit-form-textfield-test-title"]/preceding-sibling::abbr[@class="form-required"]');
$this->assertFalse(isset($elements[0]), t("No required marker on non-required field."));
diff --git a/core/modules/system/page.tpl.php b/core/modules/system/page.tpl.php
index c94f944..316f313 100644
--- a/core/modules/system/page.tpl.php
+++ b/core/modules/system/page.tpl.php
@@ -106,8 +106,8 @@
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 8aa3ed4..70cdd71 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -2565,7 +2565,7 @@ function theme_status_report($variables) {
$severity = $severities[REQUIREMENT_INFO];
}
- $severity['icon'] = '
' . $severity['title'] . '
';
+ $severity['icon'] = '
' . $severity['title'] . '
';
// Output table rows.
$output .= '
';
diff --git a/core/modules/system/system.base.css b/core/modules/system/system.base.css
index f8a7726..84c2cbc 100644
--- a/core/modules/system/system.base.css
+++ b/core/modules/system/system.base.css
@@ -220,8 +220,9 @@ tr .ajax-progress-throbber .throbber {
* from a user. The effect of this class can be toggled with the jQuery show()
* and hide() functions.
*/
-.element-hidden {
- display: none;
+.hidden {
+ display: none !important;
+ visibility: hidden;
}
/**
@@ -232,20 +233,35 @@ tr .ajax-progress-throbber .throbber {
* manner should be kept concise, to avoid unnecessary burden on the user.
* "!important" is used to prevent unintentional overrides.
*/
-.element-invisible {
- position: absolute !important;
- clip: rect(1px, 1px, 1px, 1px);
- left: 0;
+.visuallyhidden {
+ border: 0;
+ clip: rect(0 0 0 0);
+ height: 1px; margin: -1px;
+ overflow: hidden;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
/**
- * The .element-focusable class extends the .element-invisible class to allow
+ * The .visuallyhidden.focusable class extends the .visuallyhidden class to allow
* the element to be focusable when navigated to via the keyboard.
*/
-.element-invisible.element-focusable:active,
-.element-invisible.element-focusable:focus {
- position: static !important;
+.visuallyhidden.focusable:active,
+.visuallyhidden.focusable:focus {
clip: auto;
+ height: auto;
+ margin: 0;
+ overflow: visible;
+ position: static;
+ width: auto;
+}
+
+/**
+ * Hide visually and from screenreaders, but maintain layout .
+ */
+.invisible {
+ visibility: hidden;
}
/**
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 70f12bf..d67fa9a 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -212,7 +212,7 @@ function toolbar_view() {
'#theme' => 'links__toolbar_menu',
'#links' => $links,
'#attributes' => array('id' => 'toolbar-menu'),
- '#heading' => array('text' => t('Administrative toolbar'), 'level' => 'h2', 'class' => 'element-invisible'),
+ '#heading' => array('text' => t('Administrative toolbar'), 'level' => 'h2', 'class' => 'visuallyhidden'),
);
// Add logout & user account links or login link.
@@ -324,7 +324,7 @@ function toolbar_menu_navigation_links($tree) {
// Add admin link ID.
$link['attributes'] = array('id' => 'toolbar-link-' . $id);
if (!empty($item['link']['description'])) {
- $link['title'] .= ' (' . $item['link']['description'] . ')';
+ $link['title'] .= ' (' . $item['link']['description'] . ')';
$link['attributes']['title'] = $item['link']['description'];
}
$link['html'] = TRUE;
diff --git a/core/themes/bartik/template.php b/core/themes/bartik/template.php
index 5373c92..c3a8b51 100644
--- a/core/themes/bartik/template.php
+++ b/core/themes/bartik/template.php
@@ -116,7 +116,7 @@ function bartik_process_maintenance_page(&$variables) {
function bartik_preprocess_block(&$variables) {
// In the header region visually hide block titles.
if ($variables['block']->region == 'header') {
- $variables['title_attributes']['class'][] = 'element-invisible';
+ $variables['title_attributes']['class'][] = 'visuallyhidden';
}
}
diff --git a/core/themes/bartik/templates/maintenance-page.tpl.php b/core/themes/bartik/templates/maintenance-page.tpl.php
index caf1611..668d5df 100644
--- a/core/themes/bartik/templates/maintenance-page.tpl.php
+++ b/core/themes/bartik/templates/maintenance-page.tpl.php
@@ -25,23 +25,23 @@
>
-
+
-
>
+
>
-
>
+
>
-
>
+
>
diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php
index 1e31c61..a10da3b 100644
--- a/core/themes/bartik/templates/page.tpl.php
+++ b/core/themes/bartik/templates/page.tpl.php
@@ -29,10 +29,10 @@
* - $site_slogan: The slogan of the site, empty when display has been disabled
* in theme settings.
* - $hide_site_name: TRUE if the site name has been toggled off on the theme
- * settings page. If hidden, the "element-invisible" class is added to make
+ * settings page. If hidden, the "visuallyhidden" class is added to make
* the site name visually hidden, but still accessible.
* - $hide_site_slogan: TRUE if the site slogan has been toggled off on the
- * theme settings page. If hidden, the "element-invisible" class is added to
+ * theme settings page. If hidden, the "visuallyhidden" class is added to
* make the site slogan visually hidden, but still accessible.
*
* Navigation:
@@ -101,7 +101,7 @@
'heading' => array(
'text' => t('Secondary menu'),
'level' => 'h2',
- 'class' => array('element-invisible'),
+ 'class' => array('visuallyhidden'),
),
)); ?>