erpnext/foundation
1
0
Fork 0
mirror of https://github.com/erpnext/foundation.git synced 2026-10-16 18:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup base.html for foundation

Browse Source
This commit is contained in:
Faris Ansari
2018-03-22 18:35:00 +05:30
parent 45a1d03dcb
commit 1451e39010
3 changed files with 34 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
foundation/public/css/erpnext-org-theme.css
View File

@@ -252,19 +252,6 @@
margin-top: 7.5px; margin-top: 7.5px;
margin-right: 3px; 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 { [data-path=""] .get-started {
display: none; display: none;
} }

15
foundation/public/less/erpnext-org-theme.less
View File

@@ -3,21 +3,6 @@
@import (css) "reset.css"; @import (css) "reset.css";
@import "indicator.less"; @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 { [ data-path = "" ] .get-started {
display: none; display: none;

94
foundation/templates/base.html
View File

@@ -1,42 +1,21 @@
<!DOCTYPE html> {% extends "frappe/templates/base.html" %}
<!-- Built on Frappe. https://frappe.io/ --> {% block head %}
<html lang="en"> {% block meta_block %}{% endblock %}
<head>
<meta charset="utf-8"> <link href="/assets/foundation/css/erpnext-org-theme.css" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %} {{ title | striptags }} {% endblock %}</title> {% if path != '' %}
<meta name="generator" content="frappe"> <link type="text/css" rel="stylesheet" href="/assets/frappe/css/hljs.css">
{% block favicon %} <link type="text/css" rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
<link rel="shortcut icon" <link type="text/css" rel="stylesheet" href="/assets/frappe/css/octicons/octicons.css">
href="{{ (favicon or "/assets/frappe/images/favicon.png") | abs_url }}" {% endif %}
type="image/x-icon">
<link rel="icon" {% if path == 'contact' %}
href="{{ (favicon or "/assets/frappe/images/favicon.png") | abs_url }}" <link type="text/css" rel="stylesheet" href="/assets/foundation/css/bootstrap-for-webform.css">
type="image/x-icon"> {% endif %}
{% endblock %} {% endblock %}
{%- block head -%}
{% block meta_block %}{% endblock %} {% block body %}
<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>
<body data-path="{{ path }}"> <body data-path="{{ path }}">
<div class="wrapper"> <div class="wrapper">
{%- block navbar -%}{% include "templates/includes/navbar/navbar.html" %}{%- endblock -%} {%- block navbar -%}{% include "templates/includes/navbar/navbar.html" %}{%- endblock -%}
@@ -45,25 +24,20 @@
{% endblock %} {% endblock %}
{%- block footer -%}{% include "templates/includes/footer/footer.html" %}{%- endblock -%} {%- block footer -%}{% include "templates/includes/footer/footer.html" %}{%- endblock -%}
</div> </div>
{% block base_scripts %}
<!-- js should be loaded in body! --> {% block base_scripts %}
<script type="text/javascript" <!-- js should be loaded in body! -->
src="/assets/frappe/js/lib/jquery/jquery.min.js"></script> <script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
<script type="text/javascript" <script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
src="/assets/js/frappe-web.min.js"></script> {% endblock %}
{% endblock %}
{%- if js_globals is defined %} {%- for link in web_include_js %}
<script> <script type="text/javascript" src="{{ link|abs_url }}"></script>
{%- for key, value in js_globals.iteritems() %} {%- endfor -%}
window.{{ key }} = "{{ value[0] }}";
{%- endfor -%} {%- block script %}{%- endblock %}
</script>
{% endif -%} <!-- csrf_token -->
{%- 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 -%}
</body> </body>
</html> {% endblock %}