From 6b5a47c5997b64cd09e520ee7a62134d8ddfa451 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 27 Mar 2020 11:29:50 +0530
Subject: [PATCH] fix: minor bug fixes

---
 frappe/templates/web.html                     |  2 +-
 .../web_view/templates/web_view_content.html  | 21 ++++++++++++++++---
 .../doctype/web_view_item/web_view_item.json  |  8 ++++++-
 .../doctype/website_theme/website_theme.json  |  9 +++++++-
 .../doctype/website_theme/website_theme.py    |  2 --
 .../website_theme/website_theme_template.scss |  4 +---
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/frappe/templates/web.html b/frappe/templates/web.html
index e61672124a..d2d38a6320 100644
--- a/frappe/templates/web.html
+++ b/frappe/templates/web.html
@@ -13,7 +13,7 @@
 	</div>
 
 	{% block page_container %}
-	<main class="container my-5">
+	<main class="{% if not theme.use_full_width %}container{% endif %} my-5">
 		<div class="d-flex justify-content-between align-items-center">
 			<div class="page-header">
 				{% block header %}{% endblock %}
diff --git a/frappe/website/doctype/web_view/templates/web_view_content.html b/frappe/website/doctype/web_view/templates/web_view_content.html
index dd14e80d39..f2e750a472 100644
--- a/frappe/website/doctype/web_view/templates/web_view_content.html
+++ b/frappe/website/doctype/web_view/templates/web_view_content.html
@@ -10,12 +10,27 @@
 
 {%- macro render_element(element) -%}
 	{%- if element.element_type=='Content' -%}
+		<div class="web-content {{ element_class(element) }}" {{ element_style(element) }}>
 		{{ element.web_content_html }}
+		</div>
 	{%- elif element.element_type=='Image' -%}
-		<img src='{{ element.image_url }}' {%- if element.element_class -%}class='{{ element.element_class }}'{%- endif -%}>
+		<img src='{{ element.image_url }}'
+			{%- if element.element_class -%}class='{{ element.element_class }}'{%- endif -%}
+			{{ element_style(element) }}>
 	{%- endif -%}
 {%- endmacro -%}
 
+{%- macro element_class(element) -%}
+	{{ element.element_class or "" }}
+{%- endmacro -%}
+
+{%- macro element_style(element) -%}
+	{%- if element.element_style -%}
+	style = "{{ element.element_style }}"
+	{%- endif -%}
+{%- endmacro -%}
+
+
 {%- for section in sections -%}
 <section class='section {{ section.element_class or "" }} {{ section.hide and "hidden" or "" }}'>
 	<div class='section-body container'>
@@ -32,7 +47,7 @@
 	{%- elif section.section_type == 'Grid' -%}
 		<div class='row'>
 		{%- for element in section.elements -%}
-			<div class='web-content col-md-{{ element.columns or 6 }} {{ element.element_class or "" }}'>
+			<div class='col-md-{{ element.columns or 6 }}'>
 			{{ render_element(element) }}
 			</div>
 		{%- endfor -%}
@@ -50,7 +65,7 @@
 		</ul>
 		<div class="tab-content">
 			{%- for element in section.elements -%}
-			<div class="web-content tab-pane {{ loop.index == 1 and 'show active' or ''}}" role="tabpanel" id="{{ element.element_id }}">
+			<div class="tab-pane {{ loop.index == 1 and 'show active' or ''}}" role="tabpanel" id="{{ element.element_id }}">
 				{{ render_element(element) }}
 			</div>
 			{%- endfor -%}
diff --git a/frappe/website/doctype/web_view_item/web_view_item.json b/frappe/website/doctype/web_view_item/web_view_item.json
index 7be1c35415..df2c13548a 100644
--- a/frappe/website/doctype/web_view_item/web_view_item.json
+++ b/frappe/website/doctype/web_view_item/web_view_item.json
@@ -11,6 +11,7 @@
   "column_break_3",
   "columns",
   "element_class",
+  "element_style",
   "section_break_5",
   "section_type",
   "web_content_type",
@@ -98,11 +99,16 @@
    "fieldname": "hide",
    "fieldtype": "Check",
    "label": "Hide"
+  },
+  {
+   "fieldname": "element_style",
+   "fieldtype": "Small Text",
+   "label": "Element Style"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-03-17 17:06:37.157763",
+ "modified": "2020-03-18 23:14:24.020488",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Web View Item",
diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json
index 5704b97e0b..f7c6a9a1f2 100644
--- a/frappe/website/doctype/website_theme/website_theme.json
+++ b/frappe/website/doctype/website_theme/website_theme.json
@@ -14,6 +14,7 @@
   "google_font",
   "font_size",
   "font_properties",
+  "use_full_width",
   "column_break_7",
   "primary_color",
   "text_color",
@@ -142,10 +143,16 @@
    "fieldname": "font_properties",
    "fieldtype": "Data",
    "label": "Font Properties"
+  },
+  {
+   "description": "Content will not be inside a \"container\" class, you will have to add your own containers for different sections.",
+   "fieldname": "use_full_width",
+   "fieldtype": "Data",
+   "label": "Use Full Width"
   }
  ],
  "links": [],
- "modified": "2020-03-18 18:24:57.469492",
+ "modified": "2020-03-19 09:46:48.750150",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website Theme",
diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py
index 9a20bab5f7..94d1ff9fe9 100644
--- a/frappe/website/doctype/website_theme/website_theme.py
+++ b/frappe/website/doctype/website_theme/website_theme.py
@@ -37,8 +37,6 @@ class WebsiteTheme(Document):
 			frappe.throw(_("Please Duplicate this Website Theme to customize."))
 
 	def render_theme(self):
-		if self.google_font:
-			self.google_font = self.google_font.replace(' ', '+')
 		self.theme_scss = frappe.render_template('frappe/website/doctype/website_theme/website_theme_template.scss', self.as_dict())
 
 	def validate_theme(self):
diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss
index ea6775a73d..e1728eee36 100644
--- a/frappe/website/doctype/website_theme/website_theme_template.scss
+++ b/frappe/website/doctype/website_theme/website_theme_template.scss
@@ -1,5 +1,5 @@
 {% if google_font %}
-@import url('https://fonts.googleapis.com/css?family={{ google_font }}:{{ font_properties }}&display=swap');
+@import url('https://fonts.googleapis.com/css?family={{ google_font.replace(' ', '+') }}:{{ font_properties }}&display=swap');
 $font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 {% endif %}
 
@@ -18,6 +18,4 @@ body {
     {% if font_size %}
     font-size: {{ font_size }};
     {% endif %}
-    font-smoothing: antialiased;
-	-webkit-font-smoothing: antialiased;
 }