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

fix: resolve conflicts in standard.json

Browse source
This commit is contained in:
Shivam Mishra 2020-04-21 13:34:00 +05:30
parent ceabdf7403
commit 2fccdd5bd2
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/website/website_theme/standard/standard.json
View file

@ -1,17 +1,20 @@
{
"button_gradients": 0,
"button_rounded_corners": 1,
"button_shadows": 0,
"creation": "2015-02-19 13:37:33.925909",
"custom": 0,
"docstatus": 0,
"doctype": "Website Theme",
"font_properties": "300,600",
"font_size": "",
"idx": 27,
"modified": "2020-04-21 12:36:34.307990",
"modified": "2020-04-21 02:10:31.761219",
"modified_by": "Administrator",
"module": "Website",
"name": "Standard",
"owner": "Administrator",
"primary_color": "Blue",
"theme": "Standard",
"theme_scss": "\n\n$primary: Blue;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: false;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}",
"theme_url": "/assets/css/standard_44af43a7.css"
"theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n",
"theme_url": "/assets/css/standard_style.css"
}