diff --git a/core/core.services.yml b/core/core.services.yml
index c4c7593..66b2797 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -197,7 +197,7 @@ services:
arguments: ['@request_stack', '@string_translation', '@csrf_token', '@logger.channel.form']
form_submitter:
class: Drupal\Core\Form\FormSubmitter
- arguments: ['@request_stack', '@url_generator']
+ arguments: ['@request_stack', '@url_generator', '@current_route_match']
form_cache:
class: Drupal\Core\Form\FormCache
arguments: ['@app.root', '@keyvalue.expirable', '@module_handler', '@current_user', '@csrf_token', '@logger.channel.form', '@config.factory', '@request_stack', '@page_cache_request_policy']
diff --git a/core/includes/common.inc b/core/includes/common.inc
index bfcbce6..71efb5a 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -531,7 +531,7 @@ function drupal_http_header_attributes(array $attributes = array()) {
/**
* Formats an internal or external URL link as an HTML anchor tag.
*
- * This function correctly handles aliased paths and adds an 'active' class
+ * This function correctly handles aliased paths and adds an 'is-active' class
* attribute to links that point to the current page (for theming), so all
* internal links output by modules should be generated by this function if
* possible.
@@ -635,7 +635,7 @@ function _l($text, $path, array $options = array()) {
$variables['options']['attributes']['hreflang'] = $variables['options']['language']->getId();
}
- // Set the "active" class if the 'set_active_class' option is not empty.
+ // Set the "is-active" class if the 'set_active_class' option is not empty.
if (!empty($variables['options']['set_active_class'])) {
// Add a "data-drupal-link-query" attribute to let the drupal.active-link
// library know the query in a standardized manner.
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 916166b..cb81267 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -37,7 +37,7 @@ function template_preprocess_menu_local_task(&$variables) {
if (!empty($variables['element']['#active'])) {
// Add text to indicate active tab for non-visual users.
$active = '' . t('(active tab)') . '';
- $variables['attributes']['class'] = array('active');
+ $variables['attributes']['class'] = array('is-active');
// If the link does not contain HTML already, String::checkPlain() it now.
// After we set 'html'=TRUE the link will not be sanitized by l().
diff --git a/core/includes/tablesort.inc b/core/includes/tablesort.inc
index 0258a76..0132599 100644
--- a/core/includes/tablesort.inc
+++ b/core/includes/tablesort.inc
@@ -50,7 +50,7 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
// http://www.w3.org/TR/wai-aria/states_and_properties#aria-sort
$cell_attributes['aria-sort'] = ($ts['sort'] == 'asc') ? 'ascending' : 'descending';
$ts['sort'] = (($ts['sort'] == 'asc') ? 'desc' : 'asc');
- $cell_attributes['class'][] = 'active';
+ $cell_attributes['class'][] = 'is-active';
$tablesort_indicator = array(
'#theme' => 'tablesort_indicator',
'#style' => $ts['sort'],
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 43d9b8f..018d0c8 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1218,7 +1218,7 @@ function template_preprocess_maintenance_task_list(&$variables) {
$variables['tasks'][$k]['item'] = $item;
$variables['tasks'][$k]['attributes'] = new Attribute();
if ($active == $k) {
- $variables['tasks'][$k]['attributes']->addClass('active');
+ $variables['tasks'][$k]['attributes']->addClass('is-active');
$variables['tasks'][$k]['status'] = t('active');
$done = FALSE;
}
diff --git a/core/lib/Drupal/Core/Form/FormSubmitter.php b/core/lib/Drupal/Core/Form/FormSubmitter.php
index b975a70..f4c4812 100644
--- a/core/lib/Drupal/Core/Form/FormSubmitter.php
+++ b/core/lib/Drupal/Core/Form/FormSubmitter.php
@@ -12,6 +12,7 @@
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Drupal\Core\Routing\UrlGeneratorInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
/**
* Provides submission processing for forms.
@@ -33,15 +34,25 @@ class FormSubmitter implements FormSubmitterInterface {
protected $requestStack;
/**
+ * The current route match.
+ *
+ * @var \Drupal\Core\Routing\RouteMatchInterface
+ */
+ protected $currentRouteMatch;
+
+ /**
* Constructs a new FormValidator.
*
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* The request stack.
* @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
+ * @param \Drupal\Core\Routing\RouteMatchInterface $current_route_match
*/
- public function __construct(RequestStack $request_stack, UrlGeneratorInterface $url_generator) {
+ public function __construct(RequestStack $request_stack, UrlGeneratorInterface
+ $url_generator, RouteMatchInterface $current_route_match) {
$this->requestStack = $request_stack;
$this->urlGenerator = $url_generator;
+ $this->currentRouteMatch = $current_route_match;
}
/**
@@ -137,12 +148,15 @@ public function redirectForm(FormStateInterface $form_state) {
// If no redirect was specified, redirect to the current path.
elseif ($redirect === NULL) {
$request = $this->requestStack->getCurrentRequest();
- // @todo Remove dependency on the internal _system_path attribute:
- // https://www.drupal.org/node/2293521.
- $url = $this->urlGenerator->generateFromPath($request->attributes->get('_system_path'), array(
- 'query' => $request->query->all(),
- 'absolute' => TRUE,
- ));
+
+ $url = $this->urlGenerator->generateFromRoute(
+ $this->currentRouteMatch->getRouteName(),
+ $this->currentRouteMatch->getRawParameters()->all(),
+ array(
+ 'query' => $request->query->all(),
+ 'absolute' => TRUE,
+ )
+ );
}
if ($url) {
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
index 615eaa4..ecef19c 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
@@ -113,8 +113,8 @@ public function getWeight() {
public function getOptions(RouteMatchInterface $route_match) {
$options = $this->pluginDefinition['options'];
if ($this->active) {
- if (empty($options['attributes']['class']) || !in_array('active', $options['attributes']['class'])) {
- $options['attributes']['class'][] = 'active';
+ if (empty($options['attributes']['class']) || !in_array('is-active', $options['attributes']['class'])) {
+ $options['attributes']['class'][] = 'is-active';
}
}
return (array) $options;
diff --git a/core/misc/active-link.js b/core/misc/active-link.js
index 5bd12eb..c54c27e 100644
--- a/core/misc/active-link.js
+++ b/core/misc/active-link.js
@@ -8,7 +8,7 @@
"use strict";
/**
- * Append active class.
+ * Append is-active class.
*
* The link is only active if its path corresponds to the current path, the
* language of the linked path is equal to the current language, and if the
@@ -16,8 +16,8 @@
* same request with different query parameters may yield a different page
* (e.g. pagers, exposed View filters).
*
- * Does not discriminate based on element type, so allows you to set the active
- * class on any element: a, li…
+ * Does not discriminate based on element type, so allows you to set the
+ * is-active class on any element: a, li…
*/
Drupal.behaviors.activeLinks = {
attach: function (context) {
@@ -47,14 +47,14 @@
// Query the DOM.
var activeLinks = context.querySelectorAll(selectors.join(','));
for (var i = 0, il = activeLinks.length; i < il; i += 1) {
- activeLinks[i].classList.add('active');
+ activeLinks[i].classList.add('is-active');
}
},
detach: function (context, settings, trigger) {
if (trigger === 'unload') {
- var activeLinks = context.querySelectorAll('[data-drupal-link-system-path].active');
+ var activeLinks = context.querySelectorAll('[data-drupal-link-system-path].is-active');
for (var i = 0, il = activeLinks.length; i < il; i += 1) {
- activeLinks[i].classList.remove('active');
+ activeLinks[i].classList.remove('is-active');
}
}
}
diff --git a/core/modules/contextual/css/contextual.icons.css b/core/modules/contextual/css/contextual.icons.css
index 70363a7..baea472 100644
--- a/core/modules/contextual/css/contextual.icons.css
+++ b/core/modules/contextual/css/contextual.icons.css
@@ -9,8 +9,9 @@
.toolbar-bar .toolbar-icon-edit:before {
background-image: url(../../../misc/icons/bebebe/pencil.svg);
}
+
.toolbar-bar .toolbar-icon-edit:active:before,
-.toolbar-bar .toolbar-icon-edit.active:before {
+.toolbar-bar .toolbar-icon-edit.is-active:before {
background-image: url(../../../misc/icons/ffffff/pencil.svg);
}
diff --git a/core/modules/contextual/css/contextual.toolbar.css b/core/modules/contextual/css/contextual.toolbar.css
index bda844c..3c82a15 100644
--- a/core/modules/contextual/css/contextual.toolbar.css
+++ b/core/modules/contextual/css/contextual.toolbar.css
@@ -19,7 +19,7 @@
[dir="rtl"] .toolbar .toolbar-bar .contextual-toolbar-tab .toolbar-item {
padding-right: 1.3333em;
}
-.toolbar .toolbar-bar .contextual-toolbar-tab .toolbar-item.active {
+.toolbar .toolbar-bar .contextual-toolbar-tab .toolbar-item.is-active {
background-image:-webkit-linear-gradient(rgb(78,159,234) 0%, rgb(69,132,221) 100%);
background-image:linear-gradient(rgb(78,159,234) 0%,rgb(69,132,221) 100%);
}
diff --git a/core/modules/contextual/js/toolbar/views/VisualView.js b/core/modules/contextual/js/toolbar/views/VisualView.js
index 9b44451..41b095f 100644
--- a/core/modules/contextual/js/toolbar/views/VisualView.js
+++ b/core/modules/contextual/js/toolbar/views/VisualView.js
@@ -44,7 +44,7 @@
// Render the visibility.
this.$el.toggleClass('hidden', !this.model.get('isVisible'));
// Render the state.
- this.$el.find('button').toggleClass('active', !this.model.get('isViewing'));
+ this.$el.find('button').toggleClass('is-active', !this.model.get('isViewing'));
return this;
},
diff --git a/core/modules/editor/js/editor.admin.js b/core/modules/editor/js/editor.admin.js
index 74a38b2..cd637ed 100644
--- a/core/modules/editor/js/editor.admin.js
+++ b/core/modules/editor/js/editor.admin.js
@@ -387,7 +387,7 @@
*/
function filterStatusAllowsFeature(filterStatus, feature) {
// An inactive filter by definition allows the feature.
- if (!filterStatus.active) {
+ if (!filterStatus.is-active) {
return true;
}
@@ -578,7 +578,7 @@
*/
Drupal.FilterStatus = function (name) {
this.name = name;
- this.active = false;
+ this.is-active = false;
this.rules = [];
};
@@ -695,7 +695,7 @@
for (var filterID in Drupal.filterConfiguration.statuses) {
if (Drupal.filterConfiguration.statuses.hasOwnProperty(filterID)) {
// Update status.
- Drupal.filterConfiguration.statuses[filterID].active = $('[name="filters[' + filterID + '][status]"]').is(':checked');
+ Drupal.filterConfiguration.statuses[filterID].is-active = $('[name="filters[' + filterID + '][status]"]').is(':checked');
// Update current rules.
if (Drupal.filterConfiguration.liveSettingParsers[filterID]) {
diff --git a/core/modules/language/src/Tests/LanguageSwitchingTest.php b/core/modules/language/src/Tests/LanguageSwitchingTest.php
index d0e2a0d..6417bf8 100644
--- a/core/modules/language/src/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/src/Tests/LanguageSwitchingTest.php
@@ -140,14 +140,14 @@ protected function doTestLanguageBlockAnonymous($block_label) {
foreach ($language_switcher->ul->li as $link) {
$classes = explode(" ", (string) $link['class']);
list($langcode) = array_intersect($classes, array('en', 'fr'));
- if (in_array('active', $classes)) {
+ if (in_array('is-active', $classes)) {
$links['active'][] = $langcode;
}
else {
$links['inactive'][] = $langcode;
}
$anchor_classes = explode(" ", (string) $link->a['class']);
- if (in_array('active', $anchor_classes)) {
+ if (in_array('is-active', $anchor_classes)) {
$anchors['active'][] = $langcode;
}
else {
@@ -343,17 +343,17 @@ protected function doTestLanguageLinkActiveClassAnonymous() {
// Language code 'none' link should be active.
$langcode = 'none';
- $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'no_lang_link', ':class' => 'active'));
+ $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'no_lang_link', ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
// Language code 'en' link should be active.
$langcode = 'en';
- $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'en_link', ':class' => 'active'));
+ $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'en_link', ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
// Language code 'fr' link should not be active.
$langcode = 'fr';
- $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', array(':id' => 'fr_link', ':class' => 'active'));
+ $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', array(':id' => 'fr_link', ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
// Test links generated by _l() on a French page.
@@ -362,17 +362,17 @@ protected function doTestLanguageLinkActiveClassAnonymous() {
// Language code 'none' link should be active.
$langcode = 'none';
- $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'no_lang_link', ':class' => 'active'));
+ $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'no_lang_link', ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
// Language code 'en' link should not be active.
$langcode = 'en';
- $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', array(':id' => 'en_link', ':class' => 'active'));
+ $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', array(':id' => 'en_link', ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
// Language code 'fr' link should be active.
$langcode = 'fr';
- $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'fr_link', ':class' => 'active'));
+ $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'fr_link', ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
}
diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
index 37611cd..14a9287 100644
--- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
@@ -408,7 +408,7 @@ function testUrlLanguageFallback() {
// Check that the language switcher active link matches the given browser
// language.
$args = array(':id' => 'block-test-language-block', ':url' => base_path() . $GLOBALS['script_path'] . $langcode_browser_fallback);
- $fields = $this->xpath('//div[@id=:id]//a[@class="language-link active" and starts-with(@href, :url)]', $args);
+ $fields = $this->xpath('//div[@id=:id]//a[@class="language-link is-active" and starts-with(@href, :url)]', $args);
$this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->getName(), 'The browser language is the URL active language');
// Check that URLs are rewritten using the given browser language.
diff --git a/core/modules/shortcut/css/shortcut.icons.css b/core/modules/shortcut/css/shortcut.icons.css
index 18b15d7..2905d97 100644
--- a/core/modules/shortcut/css/shortcut.icons.css
+++ b/core/modules/shortcut/css/shortcut.icons.css
@@ -10,7 +10,7 @@
background-image: url(../../../misc/icons/bebebe/star.svg);
}
.toolbar-bar .toolbar-icon-shortcut:active:before,
-.toolbar-bar .toolbar-icon-shortcut.active:before {
+.toolbar-bar .toolbar-icon-shortcut.is-active:before {
background-image: url(../../../misc/icons/ffffff/star.svg);
}
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index c35796a..dff7b62 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -13,10 +13,10 @@
/**
* Markup generated by tablesort-indicator.html.twig.
*/
-th.active img {
+th.is-active img {
display: inline;
}
-td.active {
+td.is-active {
background-color: #ddd;
}
@@ -375,7 +375,7 @@ ul.menu li {
padding-top: 0.2em;
margin: 0;
}
-ul.menu a.active {
+ul.menu a.is-active {
color: #000;
}
@@ -392,7 +392,7 @@ ul.inline li {
list-style-type: none;
padding: 0 0.5em;
}
-ul.links a.active {
+ul.links a.is-active {
color: #000;
}
@@ -448,7 +448,7 @@ ul.tabs {
padding: 0.2em 1em;
text-decoration: none;
}
-.tabs a.active {
+.tabs a.is-active {
background-color: #eee;
}
.tabs a:focus,
diff --git a/core/modules/system/src/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php
index 22bade6..5c347f5 100644
--- a/core/modules/system/src/Controller/SystemController.php
+++ b/core/modules/system/src/Controller/SystemController.php
@@ -429,7 +429,7 @@ public static function setLinkActiveClass(array $element, array $context) {
if (strlen($class) > 0) {
$class .= ' ';
}
- $class .= 'active';
+ $class .= 'is-active';
$node->setAttribute('class', $class);
// Get the updated tag.
diff --git a/core/modules/system/src/Tests/Common/UrlTest.php b/core/modules/system/src/Tests/Common/UrlTest.php
index 92342d2..c3418c8 100644
--- a/core/modules/system/src/Tests/Common/UrlTest.php
+++ b/core/modules/system/src/Tests/Common/UrlTest.php
@@ -91,20 +91,20 @@ function testLinkAttributes() {
$path = 'common-test/type-link-active-class';
$this->drupalGet($path, $options_no_query);
- $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => _url($path, $options_no_query), ':class' => 'active'));
+ $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => _url($path, $options_no_query), ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), 'A link generated by _l() to the current page is marked active.');
- $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', array(':href' => _url($path, $options_query), ':class' => 'active'));
+ $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', array(':href' => _url($path, $options_query), ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), 'A link generated by _l() to the current page with a query string when the current page has no query string is not marked active.');
$this->drupalGet($path, $options_query);
- $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => _url($path, $options_query), ':class' => 'active'));
+ $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => _url($path, $options_query), ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), 'A link generated by _l() to the current page with a query string that matches the current query string is marked active.');
- $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => _url($path, $options_query_reverse), ':class' => 'active'));
+ $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => _url($path, $options_query_reverse), ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), 'A link generated by _l() to the current page with a query string that has matching parameters to the current query string but in a different order is marked active.');
- $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', array(':href' => _url($path, $options_no_query), ':class' => 'active'));
+ $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', array(':href' => _url($path, $options_no_query), ':class' => 'is-active'));
$this->assertTrue(isset($links[0]), 'A link generated by _l() to the current page without a query string when the current page has a query string is not marked active.');
// Test adding a custom class in links produced by _l() and #type 'link'.
diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index 9167501..2c53cce 100644
--- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -195,7 +195,6 @@ function testMultipleFalseOptionchecker() {
$this->assertTrue(isset($errors['tableselect']), 'Option checker disallows invalid values for radio buttons.');
}
-
/**
* Helper function for the option check test to submit a form while collecting errors.
*
@@ -215,15 +214,16 @@ private function formSubmitHelper($form, $edit) {
// The form token CSRF protection should not interfere with this test, so we
// bypass it by setting the token to FALSE.
$form['#token'] = FALSE;
-
$edit['form_id'] = $form_id;
+
+ // Disable page redirect for forms submitted programmatically. This is a
+ // solution to skip redirect step (there are no pages, then the redirect
+ // isn't possible).
+ $form_state->disableRedirect();
$form_state->setUserInput($edit);
$form_state->setFormObject(new StubForm($form_id, $form));
-
\Drupal::formBuilder()->prepareForm($form_id, $form, $form_state);
-
\Drupal::formBuilder()->processForm($form_id, $form, $form_state);
-
$errors = $form_state->getErrors();
// Clear errors and messages.
diff --git a/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php b/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
index a3146ba..efbf0a7 100644
--- a/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
+++ b/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
@@ -54,7 +54,7 @@ protected function assertMenuActiveTrail($tree, $last_active) {
$xpath .= 'li[contains(@class, :class-trail)]/a[contains(@href, :href) ' . $xpath_last_active . 'and contains(text(), :title)]';
$args = array(
':class-trail' => 'active-trail',
- ':class-active' => 'active',
+ ':class-active' => 'is-active',
':href' => _url($active_link_path),
':title' => $active_link_title,
);
diff --git a/core/modules/system/templates/table.html.twig b/core/modules/system/templates/table.html.twig
index 3d0252e..6358b2a 100644
--- a/core/modules/system/templates/table.html.twig
+++ b/core/modules/system/templates/table.html.twig
@@ -64,7 +64,7 @@
{% for cell in header %}
{%
set cell_classes = [
- cell.active_table_sort ? 'active',
+ cell.active_table_sort ? 'is-active',
]
%}
<{{ cell.tag }}{{ cell.attributes.addClass(cell_classes) }}>
diff --git a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
index b4e4393..01fa88f 100644
--- a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
+++ b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
@@ -8,6 +8,7 @@
namespace Drupal\theme_test\EventSubscriber;
use Drupal\Core\Url;
+use Drupal\Core\Routing\RouteMatchInterface;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -24,6 +25,22 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
*/
protected $container;
+ /**
+ * The current route match.
+ *
+ * @var \Drupal\Core\Routing\RouteMatchInterface
+ */
+ protected $currentRouteMatch;
+
+ /**
+ * Constructs a new ThemeTestSubscriber.
+ *
+ * @param \Drupal\Core\Routing\RouteMatchInterface $current_route_match
+ */
+ public function __construct(RouteMatchInterface $current_route_match) {
+ $this->currentRouteMatch = $current_route_match;
+ }
+
/**
* Generates themed output early in a page request.
@@ -31,9 +48,7 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
* @see \Drupal\system\Tests\Theme\ThemeEarlyInitializationTest::testRequestListener()
*/
public function onRequest(GetResponseEvent $event) {
- $request = $event->getRequest();
- $current_path = $request->attributes->get('_system_path');
- if ($current_path == 'theme-test/request-listener') {
+ if ($this->currentRouteMatch->getRouteName() === 'theme_test.request_listener') {
// First, force the theme registry to be rebuilt on this page request.
// This allows us to test a full initialization of the theme system in
// the code below.
@@ -56,9 +71,13 @@ public function onRequest(GetResponseEvent $event) {
* Ensures that the theme registry was not initialized.
*/
public function onView(GetResponseEvent $event) {
- $request = $event->getRequest();
- $current_path = $request->attributes->get('_system_path');
- if (strpos($current_path, 'user/autocomplete') === 0) {
+ $current_route = $this->currentRouteMatch->getRouteName();
+ $user_autcomplete_route = array(
+ 'user.autocomplete',
+ 'user.autocomplete_anonymous',
+ );
+
+ if (in_array($current_route, $user_autcomplete_route)) {
if ($this->container->initialized('theme.registry')) {
throw new \Exception('registry initialized');
}
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.services.yml b/core/modules/system/tests/modules/theme_test/theme_test.services.yml
index 69fd3ca..56c0ef7 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.services.yml
+++ b/core/modules/system/tests/modules/theme_test/theme_test.services.yml
@@ -1,6 +1,8 @@
services:
theme_test.subscriber:
class: Drupal\theme_test\EventSubscriber\ThemeTestSubscriber
+ arguments:
+ - @current_route_match
tags:
- { name: event_subscriber }
diff --git a/core/modules/system/tests/src/Unit/Controller/SystemControllerTest.php b/core/modules/system/tests/src/Unit/Controller/SystemControllerTest.php
index e5ec1da..4718498 100644
--- a/core/modules/system/tests/src/Unit/Controller/SystemControllerTest.php
+++ b/core/modules/system/tests/src/Unit/Controller/SystemControllerTest.php
@@ -288,7 +288,7 @@ public function providerTestSetLinkActiveClass() {
if (!isset($active_attributes['class'])) {
$active_attributes['class'] = array();
}
- $active_attributes['class'][] = 'active';
+ $active_attributes['class'][] = 'is-active';
$target_markup = $create_markup(new Attribute($active_attributes));
}
diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css
index 0122c91..653fe97 100644
--- a/core/modules/toolbar/css/toolbar.icons.css
+++ b/core/modules/toolbar/css/toolbar.icons.css
@@ -66,14 +66,14 @@
background-image: url(../../../misc/icons/bebebe/hamburger.svg);
}
.toolbar-bar .toolbar-icon-menu:active:before,
-.toolbar-bar .toolbar-icon-menu.active:before {
+.toolbar-bar .toolbar-icon-menu.is-active:before {
background-image: url(../../../misc/icons/ffffff/hamburger.svg);
}
.toolbar-bar .toolbar-icon-help:before {
background-image: url(../../../misc/icons/bebebe/questionmark-disc.svg);
}
.toolbar-bar .toolbar-icon-help:active:before,
-.toolbar-bar .toolbar-icon-help.active:before {
+.toolbar-bar .toolbar-icon-help.is-active:before {
background-image: url(../../../misc/icons/ffffff/questionmark-disc.svg);
}
@@ -84,56 +84,56 @@
background-image: url(../../../misc/icons/787878/file.svg);
}
.toolbar-icon-system-admin-content:active:before,
-.toolbar-icon-system-admin-content.active:before {
+.toolbar-icon-system-admin-content.is-active:before {
background-image: url(../../../misc/icons/000000/file.svg);
}
.toolbar-icon-system-admin-structure:before {
background-image: url(../../../misc/icons/787878/orgchart.svg);
}
.toolbar-icon-system-admin-structure:active:before,
-.toolbar-icon-system-admin-structure.active:before {
+.toolbar-icon-system-admin-structure.is-active:before {
background-image: url(../../../misc/icons/000000/orgchart.svg);
}
.toolbar-icon-system-themes-page:before {
background-image: url(../../../misc/icons/787878/paintbrush.svg);
}
.toolbar-icon-system-themes-page:active:before,
-.toolbar-icon-system-themes-page.active:before {
+.toolbar-icon-system-themes-page.is-active:before {
background-image: url(../../../misc/icons/000000/paintbrush.svg);
}
.toolbar-icon-user-admin-account:before {
background-image: url(../../../misc/icons/787878/people.svg);
}
.toolbar-icon-user-admin-account:active:before,
-.toolbar-icon-user-admin-account.active:before {
+.toolbar-icon-user-admin-account.is-active:before {
background-image: url(../../../misc/icons/000000/people.svg);
}
.toolbar-icon-system-modules-list:before {
background-image: url(../../../misc/icons/787878/puzzlepiece.svg);
}
.toolbar-icon-system-modules-list:active:before,
-.toolbar-icon-system-modules-list.active:before {
+.toolbar-icon-system-modules-list.is-active:before {
background-image: url(../../../misc/icons/000000/puzzlepiece.svg);
}
.toolbar-icon-system-admin-config:before {
background-image: url(../../../misc/icons/787878/wrench.svg);
}
.toolbar-icon-system-admin-config:active:before,
-.toolbar-icon-system-admin-config.active:before {
+.toolbar-icon-system-admin-config.is-active:before {
background-image: url(../../../misc/icons/000000/wrench.svg);
}
.toolbar-icon-system-admin-reports:before {
background-image: url(../../../misc/icons/787878/barchart.svg);
}
.toolbar-icon-system-admin-reports:active:before,
-.toolbar-icon-system-admin-reports.active:before {
+.toolbar-icon-system-admin-reports.is-active:before {
background-image: url(../../../misc/icons/000000/barchart.svg);
}
.toolbar-icon-help-main:before {
background-image: url(../../../misc/icons/787878/questionmark-disc.svg);
}
.toolbar-icon-help-main:active:before,
-.toolbar-icon-help-main.active:before {
+.toolbar-icon-help-main.is-active:before {
background-image: url(../../../misc/icons/000000/questionmark-disc.svg);
}
.toolbar .toolbar-bar .toolbar-icon:before {
diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css
index 5e4d9c8..fb1316b 100644
--- a/core/modules/toolbar/css/toolbar.menu.css
+++ b/core/modules/toolbar/css/toolbar.menu.css
@@ -32,7 +32,7 @@
margin-right: 0;
}
.toolbar .toolbar-tray .active-trail > .toolbar-box a,
-.toolbar .toolbar-tray a.active {
+.toolbar .toolbar-tray a.is-active {
color: #000;
font-weight: bold;
}
diff --git a/core/modules/toolbar/css/toolbar.module.css b/core/modules/toolbar/css/toolbar.module.css
index c2388bc..c78a6ad 100644
--- a/core/modules/toolbar/css/toolbar.module.css
+++ b/core/modules/toolbar/css/toolbar.module.css
@@ -181,21 +181,21 @@ body.toolbar-fixed .toolbar .toolbar-tray-horizontal {
/* When the configured standard breakpoint is active and the tray is in a
* vertical position, the tray does not scroll with the page. The contents of
* the tray scroll within the confines of the viewport. */
-.toolbar .toolbar-tray-vertical.active,
+.toolbar .toolbar-tray-vertical.is-active,
body.toolbar-fixed .toolbar .toolbar-tray-vertical {
height: 100%;
overflow-x: hidden;
overflow-y: auto;
position: fixed;
}
-.toolbar .toolbar-tray.active {
+.toolbar .toolbar-tray.is-active {
display: block;
}
/* Bring the tray into the viewport. By default it is just off-screen. */
-.toolbar-oriented .toolbar-tray-vertical.active {
+.toolbar-oriented .toolbar-tray-vertical.is-active {
left: 0; /* LTR */
}
-[dir="rtl"] .toolbar-oriented .toolbar-tray-vertical.active {
+[dir="rtl"] .toolbar-oriented .toolbar-tray-vertical.is-active {
left: auto;
right: 0;
}
diff --git a/core/modules/toolbar/css/toolbar.theme.css b/core/modules/toolbar/css/toolbar.theme.css
index d143a0b..a7a626f 100644
--- a/core/modules/toolbar/css/toolbar.theme.css
+++ b/core/modules/toolbar/css/toolbar.theme.css
@@ -47,7 +47,7 @@
background-image: linear-gradient(rgba(255, 255, 255, 0.125) 20%, transparent 200%);
text-decoration: none;
}
-.toolbar .toolbar-bar .toolbar-tab > .toolbar-item.active {
+.toolbar .toolbar-bar .toolbar-tab > .toolbar-item.is-active {
background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.25) 20%, transparent 200%);
background-image: linear-gradient(rgba(255, 255, 255, 0.25) 20%, transparent 200%);
}
@@ -94,7 +94,7 @@
.toolbar-tray a:hover,
.toolbar-tray a:active,
.toolbar-tray a:focus,
-.toolbar-tray a.active
+.toolbar-tray a.is-active
{
color: #000;
text-decoration: underline;
diff --git a/core/modules/toolbar/js/toolbar.menu.js b/core/modules/toolbar/js/toolbar.menu.js
index 692cd7f..3455d8a 100644
--- a/core/modules/toolbar/js/toolbar.menu.js
+++ b/core/modules/toolbar/js/toolbar.menu.js
@@ -148,7 +148,7 @@
activeItem = location.pathname;
}
if (activeItem) {
- var $activeItem = $menu.find('a[href="' + activeItem + '"]').addClass('active');
+ var $activeItem = $menu.find('a[href="' + activeItem + '"]').addClass('is-active');
var $activeTrail = $activeItem.parentsUntil('.root', 'li').addClass('active-trail');
toggleList($activeTrail, true);
}
diff --git a/core/modules/toolbar/js/views/ToolbarVisualView.js b/core/modules/toolbar/js/views/ToolbarVisualView.js
index aaccf17..f30bde3 100644
--- a/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -135,16 +135,16 @@
var $tab = $(this.model.get('activeTab'));
// Deactivate the previous tab.
$(this.model.previous('activeTab'))
- .removeClass('active')
+ .removeClass('is-active')
.prop('aria-pressed', false);
// Deactivate the previous tray.
$(this.model.previous('activeTray'))
- .removeClass('active');
+ .removeClass('is-active');
// Activate the selected tab.
if ($tab.length > 0) {
$tab
- .addClass('active')
+ .addClass('is-active')
// Mark the tab as pressed.
.prop('aria-pressed', true);
var name = $tab.attr('data-toolbar-tray');
@@ -156,7 +156,7 @@
// Activate the associated tray.
var $tray = this.$el.find('[data-toolbar-tray="' + name + '"].toolbar-tray');
if ($tray.length) {
- $tray.addClass('active');
+ $tray.addClass('is-active');
this.model.set('activeTray', $tray.get(0));
}
else {
@@ -218,9 +218,9 @@
// Remove data-offset attributes from the trays so they can be refreshed.
$trays.removeAttr('data-offset-left data-offset-right data-offset-top');
// If an active vertical tray exists, mark it as an offset element.
- $trays.filter('.toolbar-tray-vertical.active').attr('data-offset-' + edge, '');
+ $trays.filter('.toolbar-tray-vertical.is-active').attr('data-offset-' + edge, '');
// If an active horizontal tray exists, mark it as an offset element.
- $trays.filter('.toolbar-tray-horizontal.active').attr('data-offset-top', '');
+ $trays.filter('.toolbar-tray-horizontal.is-active').attr('data-offset-top', '');
},
/**
diff --git a/core/modules/tour/css/tour.module.css b/core/modules/tour/css/tour.module.css
index 6112b48..2d1f4c8 100644
--- a/core/modules/tour/css/tour.module.css
+++ b/core/modules/tour/css/tour.module.css
@@ -16,7 +16,7 @@
color: #fff;
font-weight: bold;
}
-.toolbar .tour-toolbar-tab button.active {
+.toolbar .tour-toolbar-tab button.is-active {
background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.25) 20%, transparent 200%);
background-image: linear-gradient(rgba(255, 255, 255, 0.25) 20%, transparent 200%);
}
diff --git a/core/modules/tour/js/tour.js b/core/modules/tour/js/tour.js
index cee9feb..34676fa 100644
--- a/core/modules/tour/js/tour.js
+++ b/core/modules/tour/js/tour.js
@@ -87,7 +87,7 @@
// Render the state.
var isActive = this.model.get('isActive');
this.$el.find('button')
- .toggleClass('active', isActive)
+ .toggleClass('is-active', isActive)
.prop('aria-pressed', isActive);
return this;
},
diff --git a/core/modules/user/css/user.icons.css b/core/modules/user/css/user.icons.css
index 11ae839..66c2366 100644
--- a/core/modules/user/css/user.icons.css
+++ b/core/modules/user/css/user.icons.css
@@ -10,6 +10,6 @@
background-image: url(../../../misc/icons/bebebe/person.svg);
}
.toolbar-bar .toolbar-icon-user:active:before,
-.toolbar-bar .toolbar-icon-user.active:before {
+.toolbar-bar .toolbar-icon-user.is-active:before {
background-image: url(../../../misc/icons/ffffff/person.svg);
}
diff --git a/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php b/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
index 6eff94c..2da04f3 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
@@ -87,7 +87,7 @@ public function testPageDisplayMenu() {
$this->assertResponse(200);
$element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]', array(
':ul_class' => 'tabs primary',
- ':a_class' => 'active',
+ ':a_class' => 'is-active',
));
$this->assertEqual((string) $element[0], t('Test default tab'));
$this->assertTitle(t('Test default page | Drupal'));
@@ -99,7 +99,7 @@ public function testPageDisplayMenu() {
$this->assertResponse(200);
$element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]', array(
':ul_class' => 'tabs primary',
- ':a_class' => 'active',
+ ':a_class' => 'is-active',
));
$this->assertEqual((string) $element[0], t('Test local tab'));
$this->assertTitle(t('Test local page | Drupal'));
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index d2e11d3..4cdaa99 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -338,7 +338,7 @@ function template_preprocess_views_view_summary(&$variables) {
$variables['rows'][$id]->url = _url($view->getUrl($args, $base_path), $url_options);
$variables['rows'][$id]->count = intval($row->{$argument->count_alias});
if (isset($active_urls[$variables['rows'][$id]->url])) {
- $variables['rows'][$id]->attributes['class'][] = 'active';
+ $variables['rows'][$id]->attributes['class'][] = 'is-active';
}
$variables['rows'][$id]->attributes = new Attribute($variables['rows'][$id]->attributes);
}
@@ -402,7 +402,7 @@ function template_preprocess_views_view_summary_unformatted(&$variables) {
$variables['rows'][$id]->url = _url($view->getUrl($args, $base_path), $url_options);
$variables['rows'][$id]->count = intval($row->{$argument->count_alias});
if (isset($active_urls[$variables['rows'][$id]->url])) {
- $variables['rows'][$id]->attributes['class'][] = 'active';
+ $variables['rows'][$id]->attributes['class'][] = 'is-active';
}
$variables['rows'][$id]->attributes = new Attribute($variables['rows'][$id]->attributes);
}
diff --git a/core/modules/views_ui/css/views_ui.admin.theme.css b/core/modules/views_ui/css/views_ui.admin.theme.css
index c195cce..7c2ddf9 100644
--- a/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -492,7 +492,7 @@ td.group-title {
}
.views-displays .tabs.secondary li,
-.views-displays .tabs.secondary li.active {
+.views-displays .tabs.secondary li.is-active {
background: transparent;
margin-bottom: 5px;
border: 0;
@@ -537,7 +537,7 @@ td.group-title {
/**
* Display a red border if the display doesn't validate.
*/
-.views-displays .tabs.secondary li.active a.active.error,
+.views-displays .tabs.secondary li.is-active a.is-active.error,
.views-displays .tabs.secondary a.error {
border: 2px solid #ed541d;
padding: 1px 6px;
@@ -552,8 +552,8 @@ td.group-title {
}
.views-displays .tabs.secondary li a:hover,
-.views-displays .tabs.secondary li.active a,
-.views-displays .tabs.secondary li.active a.active {
+.views-displays .tabs.secondary li.is-active a,
+.views-displays .tabs.secondary li.is-active a.is-active {
background-color: #555;
color: #fff;
}
diff --git a/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php b/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
index ff2b2cd..4b7715e 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
@@ -14,6 +14,7 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\ParameterBag;
/**
* @coversDefaultClass \Drupal\Core\Form\FormSubmitter
@@ -29,11 +30,19 @@ class FormSubmitterTest extends UnitTestCase {
protected $urlGenerator;
/**
+ * The mocked URL generator.
+ *
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Drupal\Core\Routing\RouteMatchInterface
+ */
+ protected $routeMatch;
+
+ /**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
$this->urlGenerator = $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface');
+ $this->routeMatch = $this->getMock('Drupal\Core\Routing\RouteMatchInterface');
}
/**
@@ -103,14 +112,22 @@ public function providerTestHandleFormSubmissionWithResponses() {
public function testRedirectWithNull() {
$form_submitter = $this->getFormSubmitter();
$this->urlGenerator->expects($this->once())
- ->method('generateFromPath')
- ->with(NULL, array('query' => array(), 'absolute' => TRUE))
+ ->method('generateFromRoute')
+ ->with('', [], array('query' => array(), 'absolute' => TRUE))
+ ->willReturn('');
+
+ $this->routeMatch->expects($this->once())
+ ->method('getRouteName')
->willReturn('');
+ $this->routeMatch->expects($this->once())
+ ->method('getRawParameters')
+ ->willReturn(new ParameterBag());
$form_state = $this->getMock('Drupal\Core\Form\FormStateInterface');
$form_state->expects($this->once())
->method('getRedirect')
->willReturn(NULL);
+
$redirect = $form_submitter->redirectForm($form_state);
$this->assertSame('', $redirect->getTargetUrl());
$this->assertSame(303, $redirect->getStatusCode());
@@ -236,7 +253,7 @@ protected function getFormSubmitter() {
$request_stack = new RequestStack();
$request_stack->push(new Request());
return $this->getMockBuilder('Drupal\Core\Form\FormSubmitter')
- ->setConstructorArgs(array($request_stack, $this->urlGenerator))
+ ->setConstructorArgs(array($request_stack, $this->urlGenerator, $this->routeMatch))
->setMethods(array('batchGet', 'drupalInstallationAttempted'))
->getMock();
}
diff --git a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
index 2386eb2..54f6a92 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
@@ -138,6 +138,7 @@ protected function setUp() {
$this->formCache = $this->getMock('Drupal\Core\Form\FormCacheInterface');
$this->urlGenerator = $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface');
+ $this->routeMatch = $this->getMock('Drupal\Core\Routing\RouteMatchInterface');
$this->classResolver = $this->getClassResolverStub();
$this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator')
->disableOriginalConstructor()
@@ -157,7 +158,7 @@ protected function setUp() {
->setMethods(array('drupalSetMessage'))
->getMock();
$this->formSubmitter = $this->getMockBuilder('Drupal\Core\Form\FormSubmitter')
- ->setConstructorArgs(array($this->requestStack, $this->urlGenerator))
+ ->setConstructorArgs(array($this->requestStack, $this->urlGenerator, $this->routeMatch))
->setMethods(array('batchGet', 'drupalInstallationAttempted'))
->getMock();
$this->root = dirname(dirname(substr(__DIR__, 0, -strlen(__NAMESPACE__))));
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
index 11bd9c7..18f65aa 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
@@ -312,7 +312,7 @@ public function testGetOptions() {
'attributes' => array(
'class' => array(
'example',
- 'active'
+ 'is-active'
)
)
), $this->localTaskBase->getOptions($route_match));
diff --git a/core/themes/bartik/color/preview.css b/core/themes/bartik/color/preview.css
index c063c47..a606d46 100644
--- a/core/themes/bartik/color/preview.css
+++ b/core/themes/bartik/color/preview.css
@@ -57,7 +57,7 @@
text-decoration: none;
cursor: pointer;
}
-#preview-main-menu-links li a.active {
+#preview-main-menu-links li a.is-active {
background: #fff;
border-bottom: none;
}
diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index 6ba3064..ab5a531 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -8,14 +8,14 @@ body {
}
#page,
#main-wrapper,
-.region-primary-menu .menu li a.active,
+.region-primary-menu .menu li a.is-active,
.region-primary-menu .menu li .active-trail a {
background: #ffffff;
}
-.tabs ul.primary li a.active {
+.tabs ul.primary li a.is-active {
background-color: #ffffff;
}
-.tabs ul.primary li.active a {
+.tabs ul.primary li.is-active a {
background-color: #ffffff;
border-bottom-color: #ffffff;
}
@@ -48,7 +48,7 @@ a:active,
}
.region-header,
.region-header a,
-.region-header li a.active,
+.region-header li a.is-active,
#name-and-slogan,
.site-branding-block,
#name-and-slogan a,
diff --git a/core/themes/bartik/css/components/media.css b/core/themes/bartik/css/components/media.css
index d3193a7..d035d2a 100644
--- a/core/themes/bartik/css/components/media.css
+++ b/core/themes/bartik/css/components/media.css
@@ -115,7 +115,7 @@
padding: 0.7em 0.8em;
}
.featured .region-primary-menu .menu li a:active,
- .featured .region-primary-menu .menu li a.active {
+ .featured .region-primary-menu .menu li a.is-active {
background: #f0f0f0;
background: rgba(240, 240, 240, 1.0);
}
diff --git a/core/themes/bartik/css/components/primary-menu.css b/core/themes/bartik/css/components/primary-menu.css
index bcd0cf2..278f1d8 100644
--- a/core/themes/bartik/css/components/primary-menu.css
+++ b/core/themes/bartik/css/components/primary-menu.css
@@ -44,7 +44,7 @@
background: #b3b3b3;
background: rgba(255, 255, 255, 1);
}
-.region-primary-menu .menu li a.active {
+.region-primary-menu .menu li a.is-active {
border-bottom: none;
}
diff --git a/core/themes/bartik/css/components/tabs.css b/core/themes/bartik/css/components/tabs.css
index 00f8e70..424f6cf 100644
--- a/core/themes/bartik/css/components/tabs.css
+++ b/core/themes/bartik/css/components/tabs.css
@@ -18,7 +18,7 @@ div.tabs {
margin: 0;
text-shadow: 0 1px 0 #fff;
}
-.tabs ul.primary li.active a {
+.tabs ul.primary li.is-active a {
background-color: #ffffff;
border: 1px solid #bbb;
}
@@ -33,7 +33,7 @@ div.tabs {
.tabs ul.primary li a {
padding: 5px 10px;
}
- .tabs ul.primary li.active a {
+ .tabs ul.primary li.is-active a {
border-bottom: none;
}
}
@@ -65,7 +65,7 @@ div.tabs {
border-top-left-radius: 6px;
border-top-right-radius: 6px;
}
- .tabs ul.primary li.active a {
+ .tabs ul.primary li.is-active a {
border-bottom: 1px solid #fff;
}
}
@@ -103,7 +103,7 @@ div.tabs {
padding: 0.25em 0.5em;
text-decoration: none;
}
-.tabs ul.secondary li a.active {
+.tabs ul.secondary li a.is-active {
background: #f2f2f2;
border-bottom: none;
border-radius: 5px;
diff --git a/core/themes/seven/css/components/tables.css b/core/themes/seven/css/components/tables.css
index 470537d..f8541c8 100644
--- a/core/themes/seven/css/components/tables.css
+++ b/core/themes/seven/css/components/tables.css
@@ -76,38 +76,38 @@ th > a:after {
-webkit-transition: all 0.1s;
transition: all 0.1s;
}
-th.active > a {
+th.is-active > a {
color: #004875;
}
-th.active img {
+th.is-active img {
position: absolute;
right: 0; /* LTR */
top: 50%;
}
-[dir="rtl"] th.active img {
+[dir="rtl"] th.is-active img {
right: auto;
left: 0;
}
-th.active > a:after {
+th.is-active > a:after {
border-bottom-color: #004875;
}
th > a:hover,
th > a:focus,
-th.active > a:hover,
-th.active > a:focus {
+th.is-active > a:hover,
+th.is-active > a:focus {
color: #008ee6;
text-decoration: none;
}
th > a:hover:after,
th > a:focus:after,
-th.active > a:hover:after,
-th.active > a:focus:after {
+th.is-active > a:hover:after,
+th.is-active > a:focus:after {
border-bottom-color: #008ee6;
}
td .item-list ul {
margin: 0;
}
-td.active {
+td.is-active {
background: none;
}
diff --git a/core/themes/seven/css/components/tabs.css b/core/themes/seven/css/components/tabs.css
index 78b6d63..c7517c4 100644
--- a/core/themes/seven/css/components/tabs.css
+++ b/core/themes/seven/css/components/tabs.css
@@ -81,14 +81,14 @@ li.tabs__tab a {
margin: 16px 0 0;
margin: 1rem 0 0;
}
-.tabs.primary .tabs__tab.active {
+.tabs.primary .tabs__tab.is-active {
z-index: 15;
border-color: #a6a6a6;
border-radius: 4px 0 0 0; /* LTR */
background-color: #ffffff;
color: #004f80;
}
-[dir="rtl"] .tabs.primary .tabs__tab.active {
+[dir="rtl"] .tabs.primary .tabs__tab.is-active {
border-top-left-radius: 0;
border-top-right-radius: 4px;
}
@@ -100,7 +100,7 @@ li.tabs__tab a {
background-color: #fafaf7;
text-decoration: underline;
}
-.tabs.primary .active a:focus {
+.tabs.primary .is-active a:focus {
background: none;
text-decoration: underline;
}
@@ -113,7 +113,7 @@ li.tabs__tab a {
[dir="rtl"] .tabs.primary a {
background: url(../../../../misc/icons/0074bd/chevron-left.svg) 1% center no-repeat;
}
- .tabs.primary .tabs__tab.active a {
+ .tabs.primary .tabs__tab.is-active a {
background-image: none;
}
}
@@ -157,21 +157,21 @@ li.tabs__tab a {
padding-bottom:16px;
padding-bottom: 1rem;
}
-.is-collapse-enabled .tabs__tab.active {
+.is-collapse-enabled .tabs__tab.is-active {
position: absolute;
top: 2px;
left: 0; /* LTR */
width: 75%;
border-bottom: 0;
}
-[dir="rtl"] .is-collapse-enabled .tabs__tab.active {
+[dir="rtl"] .is-collapse-enabled .tabs__tab.is-active {
left: auto;
right: 0;
}
-.is-collapse-enabled .tabs.primary a.active:before {
+.is-collapse-enabled .tabs.primary a.is-active:before {
content: none;
}
-.is-open .tabs__tab.active {
+.is-open .tabs__tab.is-active {
border-color: #a6a6a6;
background-color: #ffffff;
color: #004f80;
@@ -218,9 +218,9 @@ li.tabs__tab a {
}
/* Override the states above */
-.is-horizontal .tabs__tab.active,
-.is-horizontal .tabs.primary .tabs__tab.active,
-[dir="rtl"] .is-horizontal .tabs.primary .tabs__tab.active {
+.is-horizontal .tabs__tab.is-active,
+.is-horizontal .tabs.primary .tabs__tab.is-active,
+[dir="rtl"] .is-horizontal .tabs.primary .tabs__tab.is-active {
border-radius: 4px 4px 0 0;
position: relative;
width: auto;
@@ -259,12 +259,12 @@ li.tabs__tab a {
.tabs.secondary .tabs__tab + .tabs__tab {
border-top: 1px solid #d9d8d4;
}
-.tabs.secondary .tabs__tab.active {
+.tabs.secondary .tabs__tab.is-active {
color: #004f80;
border-left: 2px solid #004f80; /* LTR */
padding-left: 15px; /* LTR */
}
-[dir="rtl"] .tabs.secondary .tabs__tab.active {
+[dir="rtl"] .tabs.secondary .tabs__tab.is-active {
border-left: 1px solid #bfbfbf;
border-right: 2px solid #004f80;
padding-right: 15px;
@@ -286,7 +286,7 @@ li.tabs__tab a {
padding: 7px 13px 5px;
text-decoration: none;
}
-.tabs.secondary .active a {
+.tabs.secondary .is-active a {
color: #004f80;
}
.tabs.secondary a:focus {
@@ -319,7 +319,7 @@ li.tabs__tab a {
border-left-color: transparent;
padding-right: 0; /* 1 */
}
-.is-horizontal .tabs.secondary .tabs__tab.active {
+.is-horizontal .tabs.secondary .tabs__tab.is-active {
border-bottom-color: #004f80;
}
.is-horizontal .tabs.secondary .tabs__tab:hover,
diff --git a/core/themes/seven/css/components/views-ui.css b/core/themes/seven/css/components/views-ui.css
index b10e29f..3420858 100644
--- a/core/themes/seven/css/components/views-ui.css
+++ b/core/themes/seven/css/components/views-ui.css
@@ -101,8 +101,8 @@ details.fieldset-no-legend {
}
.views-displays ul.secondary li a,
-.views-displays ul.secondary li.active a,
-.views-displays ul.secondary li.active a.active {
+.views-displays ul.secondary li.is-active a,
+.views-displays ul.secondary li.is-active a.is-active {
padding: 2px 7px 3px;
}
@@ -110,8 +110,8 @@ details.fieldset-no-legend {
color: #0074bd;
}
-.views-displays ul.secondary li.active a,
-.views-displays ul.secondary li.active a.active {
+.views-displays ul.secondary li.is-active a,
+.views-displays ul.secondary li.is-active a.is-active {
border: 1px solid transparent;
}
diff --git a/core/themes/seven/css/theme/maintenance-page.css b/core/themes/seven/css/theme/maintenance-page.css
index f6b93a0..ff20b97 100644
--- a/core/themes/seven/css/theme/maintenance-page.css
+++ b/core/themes/seven/css/theme/maintenance-page.css
@@ -63,12 +63,12 @@
[dir="rtl"] .task-list li {
padding: 0.5em 3.85em 0.5em 1em;
}
- .task-list .active {
+ .task-list .is-active {
background: #ebeae4;
position: relative;
font-weight: normal;
}
- .task-list .active:after {
+ .task-list .is-active:after {
left: 100%; /* LTR */
border: solid transparent;
border-color: rgba(235, 234, 228, 0);
@@ -82,7 +82,7 @@
top: 50%;
margin-top: -1.32em;
}
- [dir="rtl"] .task-list .active:after {
+ [dir="rtl"] .task-list .is-active:after {
left: auto;
right: 100%;
border-left-color: transparent;
diff --git a/core/themes/seven/js/mobile.install.js b/core/themes/seven/js/mobile.install.js
index 7830720..43196cb 100644
--- a/core/themes/seven/js/mobile.install.js
+++ b/core/themes/seven/js/mobile.install.js
@@ -4,7 +4,7 @@
function findActiveStep(steps) {
for (var i = 0; i < steps.length; i++) {
- if (steps[i].className === 'active') {
+ if (steps[i].className === 'is-active') {
return i + 1;
}
}