From e23c62b9bc731ae5e5f776aee35945503beed0aa Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 23 Sep 2020 21:10:51 -0400 Subject: [PATCH] Add select2-bootstrap to greenwich theme --- ext/greenwich/composer.compile.json | 2 +- ext/greenwich/scss/main.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/greenwich/composer.compile.json b/ext/greenwich/composer.compile.json index a731b607fb..c58ad1afbe 100644 --- a/ext/greenwich/composer.compile.json +++ b/ext/greenwich/composer.compile.json @@ -5,7 +5,7 @@ "php-method": "\\Civi\\Compile\\Scss::build", "watch-files": ["scss"], "scss-files": {"scss/main.scss": "dist/bootstrap3.css"}, - "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets"] + "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets", "../../bower_components/select2"] } ] } diff --git a/ext/greenwich/scss/main.scss b/ext/greenwich/scss/main.scss index 8c8f7c1bbc..90da6210bb 100644 --- a/ext/greenwich/scss/main.scss +++ b/ext/greenwich/scss/main.scss @@ -1,4 +1,5 @@ #bootstrap-theme { @import "greenwich"; @import "bootstrap"; -} \ No newline at end of file + @import "select2-bootstrap"; +} -- 2.25.1