From bccff52d2c7253240ba6c468c7a731ee69fcb8fe Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Sun, 17 Jul 2022 10:01:22 -0700 Subject: [PATCH] Remove twitter-typeahead, left over from #2576 --- .../blacklight/_blacklight_base.scss | 1 - .../blacklight/_twitter_typeahead.scss | 30 ------------------- .../blacklight/blacklight_defaults.scss | 1 - package.json | 7 ++--- rollup.config.js | 6 ++-- 5 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 app/assets/stylesheets/blacklight/_twitter_typeahead.scss diff --git a/app/assets/stylesheets/blacklight/_blacklight_base.scss b/app/assets/stylesheets/blacklight/_blacklight_base.scss index fdad1fd881..78010e43c7 100644 --- a/app/assets/stylesheets/blacklight/_blacklight_base.scss +++ b/app/assets/stylesheets/blacklight/_blacklight_base.scss @@ -22,6 +22,5 @@ @import "facets"; @import "search_history"; @import "modal"; -@import "twitter_typeahead"; @import "icons"; @import "autocomplete"; diff --git a/app/assets/stylesheets/blacklight/_twitter_typeahead.scss b/app/assets/stylesheets/blacklight/_twitter_typeahead.scss deleted file mode 100644 index 8bdc41003b..0000000000 --- a/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +++ /dev/null @@ -1,30 +0,0 @@ -.twitter-typeahead { - display: inline-flex !important; - flex-grow: 2; - z-index: $zindex-typeahead; - - input.tt-input.form-control { - width: 100%; - } - - input.tt-hint.form-control { - width: 100%; - } - - .tt-menu { - @extend .dropdown-menu; - font-family: $font-family-base; - width: 100%; - } - - .tt-cursor { - background-color: $dropdown-link-hover-bg; - color: $dropdown-link-hover-color; - text-decoration: none; - } - - .tt-suggestion { - font-size: 14px; - padding: 5px 5px 5px 10px; - } -} diff --git a/app/assets/stylesheets/blacklight/blacklight_defaults.scss b/app/assets/stylesheets/blacklight/blacklight_defaults.scss index ebeeb2d61c..037c73a99c 100644 --- a/app/assets/stylesheets/blacklight/blacklight_defaults.scss +++ b/app/assets/stylesheets/blacklight/blacklight_defaults.scss @@ -4,7 +4,6 @@ $logo-image: image_url('blacklight/logo.png') !default; /* label (field names) */ $field_name_color: $text-muted !default; -$zindex-typeahead: $zindex-dropdown; // the default bootstrap font-family list includes "Segoe UI Emoji", which, on windows // renders our remove icon as an emoji-sized x instead of what we see on all other platforms... diff --git a/package.json b/package.json index 05d9390f45..1ee424c611 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,7 @@ "url": "git+https://github.com/projectblacklight/blacklight.git" }, "files": [ - "app/assets", - "app/javascript" + "app/assets" ], "author": "", "license": "Apache-2.0", @@ -28,9 +27,7 @@ "not IE 11" ], "dependencies": { - "bloodhound-js": "^1.2.3", "bootstrap": ">=4.3.1 <6.0.0", - "jquery": "^3.5.1", - "typeahead.js": "^0.11.1" + "jquery": "^3.5.1" } } diff --git a/rollup.config.js b/rollup.config.js index 613ef0ec2f..8b12430760 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -6,10 +6,8 @@ const BUNDLE = process.env.BUNDLE === 'true' const ESM = process.env.ESM === 'true' const fileDest = `blacklight${ESM ? '.esm' : ''}` -const external = ['typeahead.js/dist/bloodhound.js'] -const globals = { - 'typeahead.js/dist/bloodhound.js': 'Bloodhound' -} +const external = [] +const globals = {} const rollupConfig = { input: path.resolve(__dirname, `app/javascript/blacklight/index.js`),