vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #3413 from netchampfaris/bootstrap-theme

Browse source 
Cascade bootstrap css instead of replacing
This commit is contained in:
Makarand Bauskar 2017-06-01 16:23:49 +05:30 • committed by GitHub
commit f6a9ede30c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/website/doctype/website_theme/website_theme.py
View file

@ -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")