From 1451e3901039e485fe183843093e1aede4a37891 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 22 Mar 2018 18:35:00 +0530
Subject: [PATCH] cleanup base.html for foundation

---
 foundation/public/css/erpnext-org-theme.css   | 13 ---
 foundation/public/less/erpnext-org-theme.less | 15 ---
 foundation/templates/base.html                | 94 +++++++------------
 3 files changed, 34 insertions(+), 88 deletions(-)

diff --git a/foundation/public/css/erpnext-org-theme.css b/foundation/public/css/erpnext-org-theme.css
index 4cbff99a..6204816b 100644
--- a/foundation/public/css/erpnext-org-theme.css
+++ b/foundation/public/css/erpnext-org-theme.css
@@ -252,19 +252,6 @@
   margin-top: 7.5px;
   margin-right: 3px;
 }
-a {
-  color: #7575ff;
-  text-decoration: none;
-  transition: color 0.3s ease-out;
-}
-a:hover {
-  color: #2E3338;
-  text-decoration: underline;
-}
-a:focus,
-a:visited {
-  outline: 0;
-}
 [data-path=""] .get-started {
   display: none;
 }
diff --git a/foundation/public/less/erpnext-org-theme.less b/foundation/public/less/erpnext-org-theme.less
index 401fd688..2cec82df 100644
--- a/foundation/public/less/erpnext-org-theme.less
+++ b/foundation/public/less/erpnext-org-theme.less
@@ -3,21 +3,6 @@
 @import (css) "reset.css";
 @import "indicator.less";
 
-a {
-	color: @brand-primary;
-	text-decoration: none;
-	transition: color @transition;
-
-	&:hover {
-		color: @text-dark;
-		text-decoration: underline;
-	}
-
-	&:focus,
-	&:visited {
-		outline: 0;
-	}
-}
 
 [ data-path = "" ] .get-started {
 	display: none;
diff --git a/foundation/templates/base.html b/foundation/templates/base.html
index 8016adfd..1c7686cc 100644
--- a/foundation/templates/base.html
+++ b/foundation/templates/base.html
@@ -1,42 +1,21 @@
-<!DOCTYPE html>
-<!-- Built on Frappe. https://frappe.io/ -->
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>{% block title %} {{ title | striptags }} {% endblock %}</title>
-	<meta name="generator" content="frappe">
-    {% block favicon %}
-	<link rel="shortcut icon"
-		href="{{ (favicon or "/assets/frappe/images/favicon.png") | abs_url }}"
-		type="image/x-icon">
-	<link rel="icon"
-		href="{{ (favicon or "/assets/frappe/images/favicon.png") | abs_url }}"
-		type="image/x-icon">
-    {% endblock %}
-	{%- block head -%}
-		{% block meta_block %}{% endblock %}
-        <link href="/assets/foundation/css/erpnext-org-theme.css" rel="stylesheet">
-        {% if path != '' %}
-			<link type="text/css" rel="stylesheet" href="/assets/frappe/css/hljs.css">
-			<link type="text/css" rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
-			<link type="text/css" rel="stylesheet" href="/assets/frappe/css/octicons/octicons.css">
-        {% endif %}
-        {% if path == 'contact' %}
-			<link type="text/css" rel="stylesheet" href="/assets/foundation/css/bootstrap-for-webform.css">
-		{% endif %}
-	{%- endblock -%}
-	{%- block head_include %}{{ head_include or "" }}{% endblock -%}
-	{%- block style %}{%- endblock -%}
-    <script>
-		window.frappe = {};
-		frappe.ready_events = [];
-		frappe.ready = function(fn) {
-			frappe.ready_events.push(fn);
-		}
-		window.dev_server = {{ dev_server }};
-    </script>
-</head>
+{% extends "frappe/templates/base.html" %}
+{% block head %}
+    {% block meta_block %}{% endblock %}
+
+    <link href="/assets/foundation/css/erpnext-org-theme.css" rel="stylesheet">
+
+    {% if path != '' %}
+        <link type="text/css" rel="stylesheet" href="/assets/frappe/css/hljs.css">
+        <link type="text/css" rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
+        <link type="text/css" rel="stylesheet" href="/assets/frappe/css/octicons/octicons.css">
+    {% endif %}
+
+    {% if path == 'contact' %}
+        <link type="text/css" rel="stylesheet" href="/assets/foundation/css/bootstrap-for-webform.css">
+    {% endif %}
+{% endblock %}
+
+{% block body %}
 <body data-path="{{ path }}">
     <div class="wrapper">
         {%- block navbar -%}{% include "templates/includes/navbar/navbar.html" %}{%- endblock -%}
@@ -45,25 +24,20 @@
         {% endblock %}
         {%- block footer -%}{% include "templates/includes/footer/footer.html" %}{%- endblock -%}
     </div>
-        {% block base_scripts %}
-        <!-- js should be loaded in body! -->
-        <script type="text/javascript"
-            src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
-        <script type="text/javascript"
-            src="/assets/js/frappe-web.min.js"></script>
-        {% endblock %}
-        {%- if js_globals is defined %}
-        <script>
-        {%- for key, value in js_globals.iteritems() %}
-        window.{{ key }} = "{{ value[0] }}";
-        {%- endfor -%}
-        </script>
-        {% endif -%}
-        {%- for link in web_include_js %}
-        <script type="text/javascript" src="{{ link|abs_url }}"></script>
-        {%- endfor -%}
-        {%- block script %}{%- endblock %}
-        <!-- csrf_token -->
-        {%- block body_include %}{{ body_include or "" }}{% endblock -%}
+
+    {% block base_scripts %}
+    <!-- js should be loaded in body! -->
+    <script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
+    <script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
+    {% endblock %}
+
+    {%- for link in web_include_js %}
+    <script type="text/javascript" src="{{ link|abs_url }}"></script>
+    {%- endfor -%}
+
+    {%- block script %}{%- endblock %}
+
+    <!-- csrf_token -->
 </body>
-</html>
+{% endblock %}
+