From 8e1140527d35b1225d193c5101d263df1fcf550b Mon Sep 17 00:00:00 2001 From: Andrew Chernous Date: Mon, 6 Jul 2015 12:53:43 +0300 Subject: [PATCH] move_file_theme_css --- core/modules/file/css/file.theme.css | 62 ---------------------- core/modules/file/file.libraries.yml | 9 ---- .../Field/FieldFormatter/GenericFileFormatter.php | 5 -- core/themes/classy/classy.libraries.yml | 6 +++ core/themes/classy/css/file/file.theme.css | 62 ++++++++++++++++++++++ .../classy}/icons/application-octet-stream.png | 0 .../classy}/icons/application-pdf.png | 0 .../classy}/icons/application-x-executable.png | 0 .../classy}/icons/audio-x-generic.png | 0 .../classy}/icons/image-x-generic.png | 0 .../classy}/icons/package-x-generic.png | 0 .../file => themes/classy}/icons/text-html.png | 0 .../file => themes/classy}/icons/text-plain.png | 0 .../classy}/icons/text-x-generic.png | 0 .../file => themes/classy}/icons/text-x-script.png | 0 .../classy}/icons/video-x-generic.png | 0 .../classy}/icons/x-office-document.png | 0 .../classy}/icons/x-office-presentation.png | 0 .../classy}/icons/x-office-spreadsheet.png | 0 .../content-edit/file-managed-file.html.twig | 1 + .../templates/content-edit/file-widget.html.twig | 1 + .../classy/templates/field/file-link.html.twig | 1 + 22 files changed, 71 insertions(+), 76 deletions(-) delete mode 100644 core/modules/file/css/file.theme.css create mode 100644 core/themes/classy/css/file/file.theme.css rename core/{modules/file => themes/classy}/icons/application-octet-stream.png (100%) rename core/{modules/file => themes/classy}/icons/application-pdf.png (100%) rename core/{modules/file => themes/classy}/icons/application-x-executable.png (100%) rename core/{modules/file => themes/classy}/icons/audio-x-generic.png (100%) rename core/{modules/file => themes/classy}/icons/image-x-generic.png (100%) rename core/{modules/file => themes/classy}/icons/package-x-generic.png (100%) rename core/{modules/file => themes/classy}/icons/text-html.png (100%) rename core/{modules/file => themes/classy}/icons/text-plain.png (100%) rename core/{modules/file => themes/classy}/icons/text-x-generic.png (100%) rename core/{modules/file => themes/classy}/icons/text-x-script.png (100%) rename core/{modules/file => themes/classy}/icons/video-x-generic.png (100%) rename core/{modules/file => themes/classy}/icons/x-office-document.png (100%) rename core/{modules/file => themes/classy}/icons/x-office-presentation.png (100%) rename core/{modules/file => themes/classy}/icons/x-office-spreadsheet.png (100%) 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..ccc0c3b 100644 --- a/core/modules/file/file.libraries.yml +++ b/core/modules/file/file.libraries.yml @@ -5,17 +5,8 @@ drupal.file: css: theme: css/file.admin.css: {} - component: - css/file.theme.css: {} dependencies: - core/jquery - 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 f370037..e01ab88 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 @@ public function viewElements(FieldItemListInterface $items) { unset($item->_attributes); } } - if (!empty($elements)) { - $elements['#attached'] = array( - 'library' => array('file/drupal.file.formatter.generic'), - ); - } return $elements; } diff --git a/core/themes/classy/classy.libraries.yml b/core/themes/classy/classy.libraries.yml index 4603ff1..48ae433 100644 --- a/core/themes/classy/classy.libraries.yml +++ b/core/themes/classy/classy.libraries.yml @@ -15,3 +15,9 @@ drupal.comment.threaded: css: theme: css/comment/comment.theme.css: {} + +drupal.file: + version: VERSION + css: + theme: + css/file/file.theme.css: {} diff --git a/core/themes/classy/css/file/file.theme.css b/core/themes/classy/css/file/file.theme.css new file mode 100644 index 0000000..03d52dd --- /dev/null +++ b/core/themes/classy/css/file/file.theme.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(../../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/icons/application-octet-stream.png b/core/themes/classy/icons/application-octet-stream.png similarity index 100% rename from core/modules/file/icons/application-octet-stream.png rename to core/themes/classy/icons/application-octet-stream.png diff --git a/core/modules/file/icons/application-pdf.png b/core/themes/classy/icons/application-pdf.png similarity index 100% rename from core/modules/file/icons/application-pdf.png rename to core/themes/classy/icons/application-pdf.png diff --git a/core/modules/file/icons/application-x-executable.png b/core/themes/classy/icons/application-x-executable.png similarity index 100% rename from core/modules/file/icons/application-x-executable.png rename to core/themes/classy/icons/application-x-executable.png diff --git a/core/modules/file/icons/audio-x-generic.png b/core/themes/classy/icons/audio-x-generic.png similarity index 100% rename from core/modules/file/icons/audio-x-generic.png rename to core/themes/classy/icons/audio-x-generic.png diff --git a/core/modules/file/icons/image-x-generic.png b/core/themes/classy/icons/image-x-generic.png similarity index 100% rename from core/modules/file/icons/image-x-generic.png rename to core/themes/classy/icons/image-x-generic.png diff --git a/core/modules/file/icons/package-x-generic.png b/core/themes/classy/icons/package-x-generic.png similarity index 100% rename from core/modules/file/icons/package-x-generic.png rename to core/themes/classy/icons/package-x-generic.png diff --git a/core/modules/file/icons/text-html.png b/core/themes/classy/icons/text-html.png similarity index 100% rename from core/modules/file/icons/text-html.png rename to core/themes/classy/icons/text-html.png diff --git a/core/modules/file/icons/text-plain.png b/core/themes/classy/icons/text-plain.png similarity index 100% rename from core/modules/file/icons/text-plain.png rename to core/themes/classy/icons/text-plain.png diff --git a/core/modules/file/icons/text-x-generic.png b/core/themes/classy/icons/text-x-generic.png similarity index 100% rename from core/modules/file/icons/text-x-generic.png rename to core/themes/classy/icons/text-x-generic.png diff --git a/core/modules/file/icons/text-x-script.png b/core/themes/classy/icons/text-x-script.png similarity index 100% rename from core/modules/file/icons/text-x-script.png rename to core/themes/classy/icons/text-x-script.png diff --git a/core/modules/file/icons/video-x-generic.png b/core/themes/classy/icons/video-x-generic.png similarity index 100% rename from core/modules/file/icons/video-x-generic.png rename to core/themes/classy/icons/video-x-generic.png diff --git a/core/modules/file/icons/x-office-document.png b/core/themes/classy/icons/x-office-document.png similarity index 100% rename from core/modules/file/icons/x-office-document.png rename to core/themes/classy/icons/x-office-document.png diff --git a/core/modules/file/icons/x-office-presentation.png b/core/themes/classy/icons/x-office-presentation.png similarity index 100% rename from core/modules/file/icons/x-office-presentation.png rename to core/themes/classy/icons/x-office-presentation.png diff --git a/core/modules/file/icons/x-office-spreadsheet.png b/core/themes/classy/icons/x-office-spreadsheet.png similarity index 100% rename from core/modules/file/icons/x-office-spreadsheet.png rename to core/themes/classy/icons/x-office-spreadsheet.png 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..30147a3 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/drupal.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..cfb0a1e 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/drupal.file') }} {{ element }} diff --git a/core/themes/classy/templates/field/file-link.html.twig b/core/themes/classy/templates/field/file-link.html.twig index ad93361..a3aff04 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/drupal.file') }} {{ icon }} {{ link }} -- 1.9.5.msysgit.0