From 099bbaa91c9459ea59e2ec42b151a1eb6856d859 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Mon, 30 Apr 2018 10:25:53 +0530 Subject: [PATCH] remove bs3 js from the frappe-web.min.js and include that in base.html --- frappe/public/build.json | 1 - frappe/templates/base.html | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index 630ef7fd34..db41f14863 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -10,7 +10,6 @@ "js/frappe-web.min.js": [ "public/js/frappe/class.js", "public/js/frappe/polyfill.js", - "public/js/lib/bootstrap.min.js", "public/js/lib/md5.min.js", "public/js/frappe/provide.js", "public/js/frappe/format.js", diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 128c383d62..c47caf6d6f 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -82,6 +82,8 @@ + {% endblock %} {%- if js_globals is defined %}