From 86912e22728b8428d25b075be57cd35d6e484692 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Wed, 10 Mar 2021 19:41:05 +0100 Subject: [mod] oscar: get bootstrap and typeahead from NPM --- searx/static/themes/oscar/gruntfile.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'searx/static/themes/oscar/gruntfile.js') diff --git a/searx/static/themes/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js index ffbaf8698..df27221e0 100644 --- a/searx/static/themes/oscar/gruntfile.js +++ b/searx/static/themes/oscar/gruntfile.js @@ -11,6 +11,8 @@ module.exports = function(grunt) { filter: 'isFile', timestamp: true, src: [ + './bootstrap/dist/js/bootstrap.min.js', + './corejs-typeahead/dist/typeahead.bundle.min.js', './jquery/dist/jquery.min.js', './leaflet/dist/leaflet.js', ] @@ -23,9 +25,23 @@ module.exports = function(grunt) { filter: 'isFile', timestamp: true, src: [ + './bootstrap/dist/css/bootstrap-theme.css', + './bootstrap/dist/css/bootstrap-theme.min.css', + './bootstrap/dist/css/bootstrap-theme.min.css.map', './leaflet/dist/leaflet.css', ] }, + fonts: { + expand: true, + cwd: './node_modules', + dest: './fonts/', + flatten: true, + filter: 'isFile', + timestamp: true, + src: [ + './bootstrap/dist/fonts/glyphicons-*.*', + ] + }, leaflet_images: { expand: true, cwd: './node_modules', @@ -74,9 +90,10 @@ module.exports = function(grunt) { less: { development: { options: { - paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark"] + paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark", "src/less/bootstrap"] }, files: { + "css/bootstrap.css": "src/less/bootstrap/bootstrap.less", "css/pointhi.css": "src/less/pointhi/oscar.less", "css/logicodev.css": "src/less/logicodev-dark/oscar.less", "css/logicodev-dark.css": "src/less/logicodev/oscar.less" @@ -84,13 +101,14 @@ module.exports = function(grunt) { }, production: { options: { - paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark"], + paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark", "less/bootstrap"], plugins: [ new (require('less-plugin-clean-css'))() ], sourceMap: true, }, files: { + "css/bootstrap.min.css": "src/less/bootstrap/bootstrap.less", "css/leaflet.min.css": "css/leaflet.css", "css/pointhi.min.css": "src/less/pointhi/oscar.less", "css/logicodev.min.css": "src/less/logicodev/oscar.less", -- cgit v1.2.3