From 2fccdd5bd20cd4cd5c6852d7bb7bd607e0ec76b4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 21 Apr 2020 13:34:00 +0530
Subject: [PATCH] fix: resolve conflicts in standard.json

---
 frappe/website/website_theme/standard/standard.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
index 099d57da01..a799f25425 100644
--- a/frappe/website/website_theme/standard/standard.json
+++ b/frappe/website/website_theme/standard/standard.json
@@ -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"
 }
\ No newline at end of file