From 760bfc12609b65301ff2b869ad1a4836f898861b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 31 May 2017 15:26:36 +0530 Subject: [PATCH] Cascade bootstrap css instead of replacing --- frappe/website/doctype/website_theme/website_theme.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 23e2bbe32b..8f9841c924 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -63,6 +63,7 @@ def use_theme(theme): def add_website_theme(context): bootstrap = frappe.get_hooks("bootstrap")[0] + bootstrap = [bootstrap] context.theme = frappe._dict() if not context.disable_website_theme: @@ -71,11 +72,11 @@ def add_website_theme(context): if website_theme: if website_theme.bootstrap: - bootstrap = website_theme.bootstrap + bootstrap.append(website_theme.bootstrap) context.web_include_css = context.web_include_css + ["website_theme.css"] - context.web_include_css = [bootstrap] + context.web_include_css + context.web_include_css = bootstrap + context.web_include_css def get_active_theme(): website_theme = frappe.db.get_value("Website Settings", "Website Settings", "website_theme")