summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2015-09-30 20:56:54 (GMT)
committerwebchick2015-09-30 20:56:54 (GMT)
commit5cb07837f8f5a874df7be5f4a8503d47f1d307c8 (patch)
treee03e3ee02fc42a7acb5c2506236c9b22705c0ece
parentdd570e0ceabcda9d419c30c733be6a90c390e367 (diff)
Issue #2566771 by Cottser, mortendk, jstoller, LewisNyman, mdrummond, Gints Ä’rglis, sqndr, Chernous_dn, Manjit.Singh, axe312, emma.maria, davidhernandez, lauriii, jaxxed, akalata: [Voltron patch] Move all remaining *.theme.css to Classy
-rw-r--r--core/core.libraries.yml5
-rw-r--r--core/modules/file/css/file.theme.css62
-rw-r--r--core/modules/file/file.libraries.yml7
-rw-r--r--core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php5
-rw-r--r--core/modules/forum/forum.libraries.yml5
-rw-r--r--core/modules/forum/src/Controller/ForumController.php1
-rw-r--r--core/modules/image/image.libraries.yml6
-rw-r--r--core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php1
-rw-r--r--core/modules/user/css/user.icons.admin.css (renamed from core/modules/user/css/user.icons.theme.css)0
-rw-r--r--core/modules/user/user.libraries.yml4
-rw-r--r--core/themes/classy/classy.libraries.yml30
-rw-r--r--core/themes/classy/classy.theme26
-rw-r--r--core/themes/classy/css/components/dialog.css (renamed from core/misc/dialog.theme.css)1
-rw-r--r--core/themes/classy/css/components/dropbutton.css (renamed from core/misc/dropbutton/dropbutton.theme.css)1
-rw-r--r--core/themes/classy/css/components/file.css62
-rw-r--r--core/themes/classy/css/components/forum.css (renamed from core/modules/forum/css/forum.theme.css)2
-rw-r--r--core/themes/classy/css/components/image-widget.css (renamed from core/modules/image/css/image.theme.css)0
-rw-r--r--core/themes/classy/css/components/user.css (renamed from core/modules/user/css/user.theme.css)0
-rw-r--r--core/themes/classy/images/icons/application-octet-stream.png (renamed from core/modules/file/icons/application-octet-stream.png)bin189 -> 189 bytes
-rw-r--r--core/themes/classy/images/icons/application-pdf.png (renamed from core/modules/file/icons/application-pdf.png)bin346 -> 346 bytes
-rw-r--r--core/themes/classy/images/icons/application-x-executable.png (renamed from core/modules/file/icons/application-x-executable.png)bin189 -> 189 bytes
-rw-r--r--core/themes/classy/images/icons/audio-x-generic.png (renamed from core/modules/file/icons/audio-x-generic.png)bin314 -> 314 bytes
-rw-r--r--core/themes/classy/images/icons/forum-icons.png (renamed from core/modules/forum/icons/forum-icons.png)bin1765 -> 1765 bytes
-rw-r--r--core/themes/classy/images/icons/image-x-generic.png (renamed from core/modules/file/icons/image-x-generic.png)bin385 -> 385 bytes
-rw-r--r--core/themes/classy/images/icons/package-x-generic.png (renamed from core/modules/file/icons/package-x-generic.png)bin260 -> 260 bytes
-rw-r--r--core/themes/classy/images/icons/text-html.png (renamed from core/modules/file/icons/text-html.png)bin265 -> 265 bytes
-rw-r--r--core/themes/classy/images/icons/text-plain.png (renamed from core/modules/file/icons/text-plain.png)bin220 -> 220 bytes
-rw-r--r--core/themes/classy/images/icons/text-x-generic.png (renamed from core/modules/file/icons/text-x-generic.png)bin220 -> 220 bytes
-rw-r--r--core/themes/classy/images/icons/text-x-script.png (renamed from core/modules/file/icons/text-x-script.png)bin276 -> 276 bytes
-rw-r--r--core/themes/classy/images/icons/video-x-generic.png (renamed from core/modules/file/icons/video-x-generic.png)bin214 -> 214 bytes
-rw-r--r--core/themes/classy/images/icons/x-office-document.png (renamed from core/modules/file/icons/x-office-document.png)bin196 -> 196 bytes
-rw-r--r--core/themes/classy/images/icons/x-office-presentation.png (renamed from core/modules/file/icons/x-office-presentation.png)bin181 -> 181 bytes
-rw-r--r--core/themes/classy/images/icons/x-office-spreadsheet.png (renamed from core/modules/file/icons/x-office-spreadsheet.png)bin183 -> 183 bytes
-rw-r--r--core/themes/classy/templates/content-edit/file-managed-file.html.twig1
-rw-r--r--core/themes/classy/templates/content-edit/file-widget.html.twig1
-rw-r--r--core/themes/classy/templates/content-edit/image-widget.html.twig1
-rw-r--r--core/themes/classy/templates/dataset/forums.html.twig1
-rw-r--r--core/themes/classy/templates/field/file-link.html.twig1
-rw-r--r--core/themes/seven/css/components/dialog.css (renamed from core/themes/seven/css/components/dialog.theme.css)0
-rw-r--r--core/themes/seven/seven.libraries.yml2
-rw-r--r--core/themes/seven/seven.theme6
41 files changed, 130 insertions, 101 deletions
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index 3d5fcef..3e933c5 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -161,9 +161,6 @@ drupal.dialog:
misc/dialog/dialog.js: {}
misc/dialog/dialog.position.js: {}
misc/dialog/dialog.jquery-ui.js: {}
- css:
- theme:
- misc/dialog.theme.css: {}
dependencies:
- core/jquery
- core/drupal
@@ -199,8 +196,6 @@ drupal.dropbutton:
css:
component:
misc/dropbutton/dropbutton.css: {}
- theme:
- misc/dropbutton/dropbutton.theme.css: {}
dependencies:
- core/jquery
- core/drupal
diff --git a/core/modules/file/css/file.theme.css b/core/modules/file/css/file.theme.css
deleted file mode 100644
index e17e2b8..0000000
--- a/core/modules/file/css/file.theme.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @file
- * Default style for file module.
- */
-
-/* File icons.*/
-
-.file {
- padding-left: 20px; /* LTR */
- display: inline-block;
- min-height: 16px;
- background-repeat: no-repeat;
- background-position: left center; /* LTR */
-}
-[dir="rtl"] .file {
- padding-left: inherit;
- padding-right: 20px;
- background-position: right center;
-}
-.file--general,
-.file--application-octet-stream {
- background-image: url(../icons/application-octet-stream.png);
-}
-.file--package-x-generic {
- background-image: url(../icons/package-x-generic.png);
-}
-.file--x-office-spreadsheet {
- background-image: url(../icons/x-office-spreadsheet.png);
-}
-.file--x-office-document {
- background-image: url(../icons/x-office-document.png);
-}
-.file--x-office-presentation {
- background-image: url(../icons/x-office-presentation.png);
-}
-.file--text-x-script {
- background-image: url(../icons/text-x-script.png);
-}
-.file--text-html {
- background-image: url(../icons/text-html.png);
-}
-.file--text-plain {
- background-image: url(../icons/text-plain.png);
-}
-.file--application-pdf {
- background-image: url(../icons/application-pdf.png);
-}
-.file--application-x-executable {
- background-image: url(../icons/application-x-executable.png);
-}
-.file--audio {
- background-image: url(../icons/audio-x-generic.png);
-}
-.file--video {
- background-image: url(../icons/video-x-generic.png);
-}
-.file--text {
- background-image: url(../icons/text-x-generic.png);
-}
-.file--image {
- background-image: url(../icons/image-x-generic.png);
-}
diff --git a/core/modules/file/file.libraries.yml b/core/modules/file/file.libraries.yml
index c44af55..f72a2eb 100644
--- a/core/modules/file/file.libraries.yml
+++ b/core/modules/file/file.libraries.yml
@@ -12,10 +12,3 @@ drupal.file:
- core/jquery.once
- core/drupal
- core/drupalSettings
-
-drupal.file.formatter.generic:
- version: VERSION
- css:
- theme:
- css/file.theme.css: {}
-
diff --git a/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
index a157d96..6219cd0 100644
--- a/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
+++ b/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
@@ -47,11 +47,6 @@ class GenericFileFormatter extends FileFormatterBase {
unset($item->_attributes);
}
}
- if (!empty($elements)) {
- $elements['#attached'] = array(
- 'library' => array('file/drupal.file.formatter.generic'),
- );
- }
return $elements;
}
diff --git a/core/modules/forum/forum.libraries.yml b/core/modules/forum/forum.libraries.yml
deleted file mode 100644
index bf7079e..0000000
--- a/core/modules/forum/forum.libraries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-forum.index:
- version: VERSION
- css:
- component:
- css/forum.theme.css: {}
diff --git a/core/modules/forum/src/Controller/ForumController.php b/core/modules/forum/src/Controller/ForumController.php
index 7f84a02..7e2a815 100644
--- a/core/modules/forum/src/Controller/ForumController.php
+++ b/core/modules/forum/src/Controller/ForumController.php
@@ -224,7 +224,6 @@ class ForumController extends ControllerBase {
'#sortby' => $config->get('topics.order'),
'#forums_per_page' => $config->get('topics.page_limit'),
);
- $build['#attached']['library'][] = 'forum/forum.index';
if (empty($term->forum_container->value)) {
$build['#attached']['feed'][] = array('taxonomy/term/' . $term->id() . '/feed', 'RSS - ' . $term->getName());
}
diff --git a/core/modules/image/image.libraries.yml b/core/modules/image/image.libraries.yml
index fbf9ef4..e9061a4 100644
--- a/core/modules/image/image.libraries.yml
+++ b/core/modules/image/image.libraries.yml
@@ -1,9 +1,3 @@
-form:
- version: VERSION
- css:
- theme:
- css/image.theme.css: {}
-
admin:
version: VERSION
css:
diff --git a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
index 1449c7f..ec83970 100644
--- a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
+++ b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
@@ -160,7 +160,6 @@ class ImageWidget extends FileWidget {
$item['fids'] = $element['fids']['#value'];
$element['#theme'] = 'image_widget';
- $element['#attached']['library'][] = 'image/form';
// Add the image preview.
if (!empty($element['#files']) && $element['#preview_image_style']) {
diff --git a/core/modules/user/css/user.icons.theme.css b/core/modules/user/css/user.icons.admin.css
index 66c2366..66c2366 100644
--- a/core/modules/user/css/user.icons.theme.css
+++ b/core/modules/user/css/user.icons.admin.css
diff --git a/core/modules/user/user.libraries.yml b/core/modules/user/user.libraries.yml
index e11cbfa..73e4e15 100644
--- a/core/modules/user/user.libraries.yml
+++ b/core/modules/user/user.libraries.yml
@@ -5,8 +5,6 @@ drupal.user:
css:
component:
css/user.module.css: {}
- theme:
- css/user.theme.css: {}
dependencies:
- core/jquery
- core/drupal
@@ -33,4 +31,4 @@ drupal.user.icons:
version: VERSION
css:
theme:
- css/user.icons.theme.css: {}
+ css/user.icons.admin.css: {}
diff --git a/core/themes/classy/classy.libraries.yml b/core/themes/classy/classy.libraries.yml
index 67477a8..d39d202 100644
--- a/core/themes/classy/classy.libraries.yml
+++ b/core/themes/classy/classy.libraries.yml
@@ -31,6 +31,30 @@ book-navigation:
component:
css/components/book-navigation.css: {}
+dialog:
+ version: VERSION
+ css:
+ component:
+ css/components/dialog.css: { weight: -10 }
+
+dropbutton:
+ version: VERSION
+ css:
+ component:
+ css/components/dropbutton.css: { weight: -10 }
+
+file:
+ version: VERSION
+ css:
+ component:
+ css/components/file.css: { weight: -10 }
+
+forum:
+ version: VERSION
+ css:
+ component:
+ css/components/forum.css: { weight: -10 }
+
indented:
version: VERSION
css:
@@ -60,3 +84,9 @@ search-results:
css:
component:
css/components/search-results.css: {}
+
+user:
+ version: VERSION
+ css:
+ component:
+ css/components/user.css: { weight: -10 }
diff --git a/core/themes/classy/classy.theme b/core/themes/classy/classy.theme
new file mode 100644
index 0000000..bc2cede
--- /dev/null
+++ b/core/themes/classy/classy.theme
@@ -0,0 +1,26 @@
+<?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';
+ }
+}
diff --git a/core/misc/dialog.theme.css b/core/themes/classy/css/components/dialog.css
index 837e49f..d45d34b 100644
--- a/core/misc/dialog.theme.css
+++ b/core/themes/classy/css/components/dialog.css
@@ -1,4 +1,5 @@
/**
+ * @file
* Presentational styles for Drupal dialogs.
*/
diff --git a/core/misc/dropbutton/dropbutton.theme.css b/core/themes/classy/css/components/dropbutton.css
index 65f2568..cf8c40a 100644
--- a/core/misc/dropbutton/dropbutton.theme.css
+++ b/core/themes/classy/css/components/dropbutton.css
@@ -1,4 +1,3 @@
-
/**
* @file
* General styles for dropbuttons.
diff --git a/core/themes/classy/css/components/file.css b/core/themes/classy/css/components/file.css
new file mode 100644
index 0000000..5e16b4f
--- /dev/null
+++ b/core/themes/classy/css/components/file.css
@@ -0,0 +1,62 @@
+/**
+ * @file
+ * Default style for file module.
+ */
+
+/* File icons.*/
+
+.file {
+ padding-left: 20px; /* LTR */
+ display: inline-block;
+ min-height: 16px;
+ background-repeat: no-repeat;
+ background-position: left center; /* LTR */
+}
+[dir="rtl"] .file {
+ padding-left: inherit;
+ padding-right: 20px;
+ background-position: right center;
+}
+.file--general,
+.file--application-octet-stream {
+ background-image: url(../../images/icons/application-octet-stream.png);
+}
+.file--package-x-generic {
+ background-image: url(../../images/icons/package-x-generic.png);
+}
+.file--x-office-spreadsheet {
+ background-image: url(../../images/icons/x-office-spreadsheet.png);
+}
+.file--x-office-document {
+ background-image: url(../../images/icons/x-office-document.png);
+}
+.file--x-office-presentation {
+ background-image: url(../../images/icons/x-office-presentation.png);
+}
+.file--text-x-script {
+ background-image: url(../../images/icons/text-x-script.png);
+}
+.file--text-html {
+ background-image: url(../../images/icons/text-html.png);
+}
+.file--text-plain {
+ background-image: url(../../images/icons/text-plain.png);
+}
+.file--application-pdf {
+ background-image: url(../../images/icons/application-pdf.png);
+}
+.file--application-x-executable {
+ background-image: url(../../images/icons/application-x-executable.png);
+}
+.file--audio {
+ background-image: url(../../images/icons/audio-x-generic.png);
+}
+.file--video {
+ background-image: url(../../images/icons/video-x-generic.png);
+}
+.file--text {
+ background-image: url(../../images/icons/text-x-generic.png);
+}
+.file--image {
+ background-image: url(../../images/icons/image-x-generic.png);
+}
diff --git a/core/modules/forum/css/forum.theme.css b/core/themes/classy/css/components/forum.css
index 1ce5c4d..2f71524 100644
--- a/core/modules/forum/css/forum.theme.css
+++ b/core/themes/classy/css/components/forum.css
@@ -8,7 +8,7 @@
margin: 0.5em;
}
.forum__icon {
- background-image: url(../icons/forum-icons.png);
+ background-image: url(../../images/icons/forum-icons.png);
background-repeat: no-repeat;
float: left; /* LTR */
height: 24px;
diff --git a/core/modules/image/css/image.theme.css b/core/themes/classy/css/components/image-widget.css
index 3da51ef..3da51ef 100644
--- a/core/modules/image/css/image.theme.css
+++ b/core/themes/classy/css/components/image-widget.css
diff --git a/core/modules/user/css/user.theme.css b/core/themes/classy/css/components/user.css
index d62ff25..d62ff25 100644
--- a/core/modules/user/css/user.theme.css
+++ b/core/themes/classy/css/components/user.css
diff --git a/core/modules/file/icons/application-octet-stream.png b/core/themes/classy/images/icons/application-octet-stream.png
index d545321..d545321 100644
--- a/core/modules/file/icons/application-octet-stream.png
+++ b/core/themes/classy/images/icons/application-octet-stream.png
Binary files differ
diff --git a/core/modules/file/icons/application-pdf.png b/core/themes/classy/images/icons/application-pdf.png
index 36107d6..36107d6 100644
--- a/core/modules/file/icons/application-pdf.png
+++ b/core/themes/classy/images/icons/application-pdf.png
Binary files differ
diff --git a/core/modules/file/icons/application-x-executable.png b/core/themes/classy/images/icons/application-x-executable.png
index d545321..d545321 100644
--- a/core/modules/file/icons/application-x-executable.png
+++ b/core/themes/classy/images/icons/application-x-executable.png
Binary files differ
diff --git a/core/modules/file/icons/audio-x-generic.png b/core/themes/classy/images/icons/audio-x-generic.png
index 28d7f50..28d7f50 100644
--- a/core/modules/file/icons/audio-x-generic.png
+++ b/core/themes/classy/images/icons/audio-x-generic.png
Binary files differ
diff --git a/core/modules/forum/icons/forum-icons.png b/core/themes/classy/images/icons/forum-icons.png
index e291de6..e291de6 100644
--- a/core/modules/forum/icons/forum-icons.png
+++ b/core/themes/classy/images/icons/forum-icons.png
Binary files differ
diff --git a/core/modules/file/icons/image-x-generic.png b/core/themes/classy/images/icons/image-x-generic.png
index c1b814f..c1b814f 100644
--- a/core/modules/file/icons/image-x-generic.png
+++ b/core/themes/classy/images/icons/image-x-generic.png
Binary files differ
diff --git a/core/modules/file/icons/package-x-generic.png b/core/themes/classy/images/icons/package-x-generic.png
index 21fc382..21fc382 100644
--- a/core/modules/file/icons/package-x-generic.png
+++ b/core/themes/classy/images/icons/package-x-generic.png
Binary files differ
diff --git a/core/modules/file/icons/text-html.png b/core/themes/classy/images/icons/text-html.png
index 9c7c793..9c7c793 100644
--- a/core/modules/file/icons/text-html.png
+++ b/core/themes/classy/images/icons/text-html.png
Binary files differ
diff --git a/core/modules/file/icons/text-plain.png b/core/themes/classy/images/icons/text-plain.png
index 0680484..0680484 100644
--- a/core/modules/file/icons/text-plain.png
+++ b/core/themes/classy/images/icons/text-plain.png
Binary files differ
diff --git a/core/modules/file/icons/text-x-generic.png b/core/themes/classy/images/icons/text-x-generic.png
index 0680484..0680484 100644
--- a/core/modules/file/icons/text-x-generic.png
+++ b/core/themes/classy/images/icons/text-x-generic.png
Binary files differ
diff --git a/core/modules/file/icons/text-x-script.png b/core/themes/classy/images/icons/text-x-script.png
index f9ecca8..f9ecca8 100644
--- a/core/modules/file/icons/text-x-script.png
+++ b/core/themes/classy/images/icons/text-x-script.png
Binary files differ
diff --git a/core/modules/file/icons/video-x-generic.png b/core/themes/classy/images/icons/video-x-generic.png
index a2b71f9..a2b71f9 100644
--- a/core/modules/file/icons/video-x-generic.png
+++ b/core/themes/classy/images/icons/video-x-generic.png
Binary files differ
diff --git a/core/modules/file/icons/x-office-document.png b/core/themes/classy/images/icons/x-office-document.png
index 40db538..40db538 100644
--- a/core/modules/file/icons/x-office-document.png
+++ b/core/themes/classy/images/icons/x-office-document.png
Binary files differ
diff --git a/core/modules/file/icons/x-office-presentation.png b/core/themes/classy/images/icons/x-office-presentation.png
index fb119e5..fb119e5 100644
--- a/core/modules/file/icons/x-office-presentation.png
+++ b/core/themes/classy/images/icons/x-office-presentation.png
Binary files differ
diff --git a/core/modules/file/icons/x-office-spreadsheet.png b/core/themes/classy/images/icons/x-office-spreadsheet.png
index 9af7b61..9af7b61 100644
--- a/core/modules/file/icons/x-office-spreadsheet.png
+++ b/core/themes/classy/images/icons/x-office-spreadsheet.png
Binary files differ
diff --git a/core/themes/classy/templates/content-edit/file-managed-file.html.twig b/core/themes/classy/templates/content-edit/file-managed-file.html.twig
index f639237..e7ae48d 100644
--- a/core/themes/classy/templates/content-edit/file-managed-file.html.twig
+++ b/core/themes/classy/templates/content-edit/file-managed-file.html.twig
@@ -10,6 +10,7 @@
* @see template_preprocess_file_managed_file()
*/
#}
+{{ attach_library('classy/file') }}
{%
set classes = [
'js-form-managed-file',
diff --git a/core/themes/classy/templates/content-edit/file-widget.html.twig b/core/themes/classy/templates/content-edit/file-widget.html.twig
index 55de590..23d03a1 100644
--- a/core/themes/classy/templates/content-edit/file-widget.html.twig
+++ b/core/themes/classy/templates/content-edit/file-widget.html.twig
@@ -10,6 +10,7 @@
* @see template_preprocess_file_widget()
*/
#}
+{{ attach_library('classy/file') }}
<div{{ attributes }}>
{{ element }}
</div>
diff --git a/core/themes/classy/templates/content-edit/image-widget.html.twig b/core/themes/classy/templates/content-edit/image-widget.html.twig
index dac3a22..5e8033f 100644
--- a/core/themes/classy/templates/content-edit/image-widget.html.twig
+++ b/core/themes/classy/templates/content-edit/image-widget.html.twig
@@ -10,6 +10,7 @@
* @see template_preprocess_image_widget()
*/
#}
+{{ attach_library('classy/image-widget') }}
<div{{ attributes }}>
{% if data.preview %}
<div class="image-preview">
diff --git a/core/themes/classy/templates/dataset/forums.html.twig b/core/themes/classy/templates/dataset/forums.html.twig
index eada3a8..e3f2212 100644
--- a/core/themes/classy/templates/dataset/forums.html.twig
+++ b/core/themes/classy/templates/dataset/forums.html.twig
@@ -14,6 +14,7 @@
* @see template_preprocess_forums()
*/
#}
+{{ attach_library('classy/forum') }}
{% if forums_defined %}
<div class="forum">
{{ forums }}
diff --git a/core/themes/classy/templates/field/file-link.html.twig b/core/themes/classy/templates/field/file-link.html.twig
index ad93361..11170c0 100644
--- a/core/themes/classy/templates/field/file-link.html.twig
+++ b/core/themes/classy/templates/field/file-link.html.twig
@@ -11,4 +11,5 @@
* @see template_preprocess_file_link()
*/
#}
+{{ attach_library('classy/file') }}
<span{{ attributes }}>{{ icon }} {{ link }}</span>
diff --git a/core/themes/seven/css/components/dialog.theme.css b/core/themes/seven/css/components/dialog.css
index 60954d6..60954d6 100644
--- a/core/themes/seven/css/components/dialog.theme.css
+++ b/core/themes/seven/css/components/dialog.css
diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml
index 764403b..cec9887 100644
--- a/core/themes/seven/seven.libraries.yml
+++ b/core/themes/seven/seven.libraries.yml
@@ -92,4 +92,4 @@ seven.drupal.dialog:
version: VERSION
css:
theme:
- css/components/dialog.theme.css: {}
+ css/components/dialog.css: {}
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 9727e15..7bd56e0 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -186,8 +186,8 @@ function seven_library_info_alter(&$libraries, $extension) {
unset($libraries['jquery.ui']['css']['theme']['assets/vendor/jquery.ui/themes/base/theme.css']);
$libraries['jquery.ui']['dependencies'][] = 'seven/seven.jquery.ui';
}
- if ($extension == 'core' && isset($libraries['drupal.dialog'])) {
- unset($libraries['drupal.dialog']['css']['theme']['misc/dialog.theme.css']);
- $libraries['drupal.dialog']['dependencies'][] = 'seven/seven.drupal.dialog';
+ if ($extension == 'classy' && isset($libraries['dialog'])) {
+ unset($libraries['dialog']['css']['component']['css/components/dialog.css']);
+ $libraries['dialog']['dependencies'][] = 'seven/seven.drupal.dialog';
}
}