Commit 2d1f4274 authored by alexpott's avatar alexpott

Issue #2580255 by Wim Leers: Remove (classy|seven)_library_info_alter() in...

Issue #2580255 by Wim Leers: Remove (classy|seven)_library_info_alter() in favor of libraries-extend
parent a47dd7ad
......@@ -8,3 +8,11 @@ core: 8.x
libraries:
- classy/base
- core/normalize
libraries-extend:
user/drupal.user:
- classy/user
core/drupal.dropbutton:
- classy/dropbutton
core/drupal.dialog:
- classy/dialog
<?php
/**
* @file
* Functions to support theming in the Classy theme.
*/
/**
* Implements hook_library_info_alter().
*/
function classy_library_info_alter(&$libraries, $extension) {
if ($extension == 'user' && isset($libraries['drupal.user'])) {
// @todo Replace with https://www.drupal.org/node/2497667 when possible.
$library_discovery = \Drupal::service('library.discovery');
$library = $library_discovery->getLibraryByName('classy', 'user');
foreach ($library['css'] as $css) {
$libraries['drupal.user']['css']['component'][base_path() . $css['data']] = [];
}
}
if ($extension == 'core' && isset($libraries['drupal.dropbutton'])) {
$libraries['drupal.dropbutton']['dependencies'][] = 'classy/dropbutton';
}
if ($extension == 'core' && isset($libraries['drupal.dialog'])) {
$libraries['drupal.dialog']['dependencies'][] = 'classy/dialog';
}
}
......@@ -9,10 +9,25 @@ core: 8.x
libraries:
- seven/global-styling
libraries-override:
core/drupal.vertical-tabs:
css:
component:
misc/vertical-tabs.css: false
core/jquery.ui:
css:
theme:
assets/vendor/jquery.ui/themes/base/theme.css: false
core/jquery.ui.dialog:
css:
component:
assets/vendor/jquery.ui/themes/base/dialog.css: false
classy/dialog:
seven/seven.drupal.dialog
libraries-extend:
core/drupal.vertical-tabs:
- seven/vertical-tabs
core/jquery.ui:
- seven/seven.jquery.ui
quickedit_stylesheets:
- css/components/quickedit.css
regions:
......
......@@ -187,21 +187,3 @@ function seven_form_node_form_alter(&$form, FormStateInterface $form_state) {
$form['revision_information']['#type'] = 'container';
$form['revision_information']['#group'] = 'meta';
}
/**
* Implements hook_library_info_alter().
*/
function seven_library_info_alter(&$libraries, $extension) {
if ($extension == 'core' && isset($libraries['drupal.vertical-tabs'])) {
unset($libraries['drupal.vertical-tabs']['css']['component']['misc/vertical-tabs.css']);
$libraries['drupal.vertical-tabs']['dependencies'][] = 'seven/vertical-tabs';
}
if ($extension == 'core' && isset($libraries['jquery.ui'])) {
unset($libraries['jquery.ui']['css']['theme']['assets/vendor/jquery.ui/themes/base/theme.css']);
$libraries['jquery.ui']['dependencies'][] = 'seven/seven.jquery.ui';
}
if ($extension == 'classy' && isset($libraries['dialog'])) {
unset($libraries['dialog']['css']['component']['css/components/dialog.css']);
$libraries['dialog']['dependencies'][] = 'seven/seven.drupal.dialog';
}
}
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