diff --git a/README.md b/README.md index 08046cf..65e6394 100644 --- a/README.md +++ b/README.md @@ -24,22 +24,13 @@ This module requires the following modules: * Paragraphs (https://www.drupal.org/project/paragraphs) * Paragraphs Collection (https://www.drupal.org/project/paragraphs_collection) - -And requires following libraries: - - * Bootstrap v4.0.0-alpha.6 (https://v4-alpha.getbootstrap.com/) + * BS Lib (https://www.drupal.org/project/bs_lib) INSTALLATION ------------ Please check the module dependencies and eventually the README.md files of the related modules to properly install everything you need. -Bootstrap 4 library installation: -- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.6.zip) extract, rename extracted folder to bootstrap and place it in libraries folder. - -Bootstrap v4.0.0-alpha.6 is available for download in several ways, including some of your favorite package managers.(https://v4-alpha.getbootstrap.com/getting-started/download/) - - CONFIGURATION ------------- @todo diff --git a/composer.json b/composer.json index 3128869..8420c64 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "drupal/core": "~8", "drupal/paragraphs": "1.x-dev", "drupal/paragraphs_collection": "1.x-dev", + "drupal/bs_lib": "1.x-dev", "drupal/entity_usage": "1.x-dev" }, "require-dev": { diff --git a/paragraphs_collection_bootstrap.info.yml b/paragraphs_collection_bootstrap.info.yml index fe7d9de..5d03a33 100644 --- a/paragraphs_collection_bootstrap.info.yml +++ b/paragraphs_collection_bootstrap.info.yml @@ -7,6 +7,7 @@ package: Paragraphs dependencies: - paragraphs:paragraphs - paragraphs_collection:paragraphs_collection + - bs_lib:bs_lib - drupal:image test_dependencies: diff --git a/paragraphs_collection_bootstrap.libraries.yml b/paragraphs_collection_bootstrap.libraries.yml index 99edff3..b86a939 100644 --- a/paragraphs_collection_bootstrap.libraries.yml +++ b/paragraphs_collection_bootstrap.libraries.yml @@ -1,73 +1,14 @@ -bootstrap: - css: - component: - /libraries/bootstrap/dist/css/bootstrap.min.css: {} - -util: - version: VERSION - js: - /libraries/bootstrap/js/dist/util.js: {} - dependencies: - - core/jquery - progress: css: component: css/progress.css: {} -pcb_accordion: - version: VERSION - js: - /libraries/bootstrap/js/dist/collapse.js: {} - dependencies: - - core/jquery - - paragraphs_collection_bootstrap/util - -pcb_tab: - version: VERSION - js: - /libraries/bootstrap/js/dist/tab.js: {} - dependencies: - - core/jquery - - paragraphs_collection_bootstrap/util - -carousel: - version: VERSION - js: - /libraries/bootstrap/js/dist/carousel.js: {} - dependencies: - - core/jquery - - paragraphs_collection_bootstrap/util - -pcb_tether: - version: VERSION - js: - /libraries/tether/dist/js/tether.min.js: {} - dependencies: - - core/jquery - -pcb_tooltip: - version: VERSION - js: - /libraries/bootstrap/js/dist/tooltip.js: {} - dependencies: - - core/jquery - - paragraphs_collection_bootstrap/pcb_tether - tooltip: js: js/tooltip.js: {} dependencies: - core/jquery -pcb_popover: - version: VERSION - js: - /libraries/bootstrap/js/dist/popover.js: {} - dependencies: - - core/jquery - - paragraphs_collection_bootstrap/pcb_tooltip - popover: js: js/popover.js: {} diff --git a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapAccordionPlugin.php b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapAccordionPlugin.php index 41db8bb..18454bf 100644 --- a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapAccordionPlugin.php +++ b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapAccordionPlugin.php @@ -162,8 +162,8 @@ class ParagraphsBootstrapAccordionPlugin extends ParagraphsBehaviorBase { ], '#attached' => [ 'library' => [ - 'paragraphs_collection_bootstrap/pcb_accordion', - 'paragraphs_collection_bootstrap/bootstrap', + 'bs_lib/collapse', + 'bs_lib/bootstrap_css', ], ], ]; diff --git a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapCarouselPlugin.php b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapCarouselPlugin.php index ed97a1e..c14323a 100644 --- a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapCarouselPlugin.php +++ b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapCarouselPlugin.php @@ -194,8 +194,7 @@ class ParagraphsBootstrapCarouselPlugin extends ParagraphsBehaviorBase { ], '#attached' => [ 'library' => [ - 'paragraphs_collection_bootstrap/bootstrap', - 'paragraphs_collection_bootstrap/carousel', + 'bs_lib/carousel', ], ], ]; diff --git a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapPopoverPlugin.php b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapPopoverPlugin.php index 116983c..430dad4 100644 --- a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapPopoverPlugin.php +++ b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapPopoverPlugin.php @@ -237,7 +237,7 @@ class ParagraphsBootstrapPopoverPlugin extends ParagraphsBehaviorBase { 'data-offset' => $paragraph->getBehaviorSetting($this->getPluginId(), 'offset'), ]; - $build['#attached']['library'][] = 'paragraphs_collection_bootstrap/pcb_popover'; + $build['#attached']['library'][] = 'bs_lib/popover'; $build['#attached']['library'][] = 'paragraphs_collection_bootstrap/popover'; } diff --git a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapProgressBarPlugin.php b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapProgressBarPlugin.php index b558aaa..ac3dc83 100644 --- a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapProgressBarPlugin.php +++ b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapProgressBarPlugin.php @@ -41,7 +41,7 @@ class ParagraphsBootstrapProgressBarPlugin extends ParagraphsBehaviorBase { $max = 100; } $build['#attached']['library'] = [ - 'paragraphs_collection_bootstrap/bootstrap', + 'bs_lib/progress', 'paragraphs_collection_bootstrap/progress', ]; $build['#attributes'] = [ diff --git a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTabsPlugin.php b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTabsPlugin.php index d2a7ec6..dcd2aab 100644 --- a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTabsPlugin.php +++ b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTabsPlugin.php @@ -193,8 +193,8 @@ class ParagraphsBootstrapTabsPlugin extends ParagraphsBehaviorBase { ], '#attached' => [ 'library' => [ - 'paragraphs_collection_bootstrap/pcb_tab', - 'paragraphs_collection_bootstrap/bootstrap', + 'bs_lib/tab', + 'bs_lib/bootstrap_css', ], ], ]; diff --git a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTooltipPlugin.php b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTooltipPlugin.php index 30b0f9c..2fa74a0 100644 --- a/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTooltipPlugin.php +++ b/src/Plugin/paragraphs/Behavior/ParagraphsBootstrapTooltipPlugin.php @@ -199,7 +199,7 @@ class ParagraphsBootstrapTooltipPlugin extends ParagraphsBehaviorBase { 'data-offset' => $paragraph->getBehaviorSetting($this->getPluginId(), 'offset'), ]; - $build['#attached']['library'][] = 'paragraphs_collection_bootstrap/pcb_tooltip'; + $build['#attached']['library'][] = 'bs_lib/tooltip'; $build['#attached']['library'][] = 'paragraphs_collection_bootstrap/tooltip'; } @@ -220,4 +220,4 @@ class ParagraphsBootstrapTooltipPlugin extends ParagraphsBehaviorBase { ]; } -} \ No newline at end of file +}