From 35ef3762922e0a0fbfb00b1b9eb11d35b3eb3662 Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Wed, 10 Jun 2020 09:03:10 -0400
Subject: [PATCH] Fixing libraries and css/js loading correctly from Drupal
---
uw_fdsu_theme_resp.info.yml | 35 ++++++--------------------------
uw_fdsu_theme_resp.libraries.yml | 23 ++++++---------------
2 files changed, 12 insertions(+), 46 deletions(-)
diff --git a/uw_fdsu_theme_resp.info.yml b/uw_fdsu_theme_resp.info.yml
index daba4d2b..f1eba194 100644
--- a/uw_fdsu_theme_resp.info.yml
+++ b/uw_fdsu_theme_resp.info.yml
@@ -17,35 +17,6 @@ libraries:
# component:
# css/chosen-drupal.css: false
-libraries-override:
- core/drupal.dropbutton:
- js:
- misc/dropbutton/dropbutton.js: uw_wcms_gesso/gesso/js/overrides/dropbutton.js
- css:
- component:
- /core/themes/stable/css/core/dropbutton/dropbutton.css: false
- core/drupal.collapse:
- js:
- misc/collapse.js: uw_wcms_gesso/gesso/js/overrides/collapse.js
- core/modernizr:
- js:
- assets/vendor/modernizr/modernizr.min.js: uw_wcms_gesso/gesso/js/lib/modernizr.min.js
- system/base:
- css:
- component:
- /core/themes/stable/css/system/components/align.module.css: false
- /core/themes/stable/css/system/components/clearfix.module.css: false
- /core/themes/stable/css/system/components/container-inline.module.css: false
- /core/themes/stable/css/system/components/details.module.css: false
- /core/themes/stable/css/system/components/fieldgroup.module.css: false
- /core/themes/stable/css/system/components/hidden.module.css: false
- /core/themes/stable/css/system/components/item-list.module.css: false
- /core/themes/stable/css/system/components/nowrap.module.css: false
- /core/themes/stable/css/system/components/position-container.module.css: false
- /core/themes/stable/css/system/components/progress.module.css: false
- /core/themes/stable/css/system/components/reset-appearance.module.css: false
- /core/themes/stable/css/system/components/resize.module.css: false
-
# CKEditor stylesheet loads in wysiwyg to give content editors a better experience
ckeditor_stylesheets:
- https://fonts.googleapis.com/css?family=Lora:400,700|Open+Sans:300,400,600,700
@@ -91,3 +62,9 @@ component-libraries:
marcos:
paths:
- source/_macros
+
+# Information added by drupal-composer/info-rewrite; date of revision: 2020-06-02T19:33:59+00:00.
+version: '8.x-1.x'
+core: '8.x'
+project: 'uw_fdsu_theme_resp'
+datestamp: 1591126439
diff --git a/uw_fdsu_theme_resp.libraries.yml b/uw_fdsu_theme_resp.libraries.yml
index f2f7b747..976f3654 100644
--- a/uw_fdsu_theme_resp.libraries.yml
+++ b/uw_fdsu_theme_resp.libraries.yml
@@ -2,23 +2,12 @@ global:
css:
theme:
css/styles.css: {}
-
-factsfigures:
- css:
- theme:
https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css: {}
https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.theme.default.min.css: {}
js:
- https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js: {}
- uw_wcms_gesso/source/_patterns/04-components/facts-and-figures/facts-and-figures.js: {}
-
-expandcollapse:
- js:
- uw_wcms_gesso/source/_patterns/04-components/expand-collapse/expand-collapse.js: {}
-
-# Examples of Library syntax
-# typekit:
-# header: true
-# js:
-# //use.typekit.net/TYPEKIT_ID.js: { every_page: true }
-
+ js/component_scripts.min.js: {}
+ js/bootstrap.min.js: {}
+ js/Customjs.js: {}
+ dependencies:
+ - core/jquery
+ - core/jquery.ui.effects.core
--
GitLab