diff --git a/home/page/attributions/attributions.html b/home/page/attributions/attributions.html
index 07da9fd89d6..2d08c79dd0f 100644
--- a/home/page/attributions/attributions.html
+++ b/home/page/attributions/attributions.html
@@ -26,6 +26,10 @@
| Python Programming Language |
The "batteries included" language that lets you write elegant code, quickly.
Python Libraries:
diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index a67c9f1746f..00c02bb2b3c 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -12,7 +12,7 @@ body {
background-color: #edede7;
{% endif %}
{% if doc.font or doc.google_web_font_for_text %}
- font-family: '{{ doc.google_web_font_for_text or doc.font }}', Verdana, Sans !important;
+ font-family: '{{ doc.google_web_font_for_text or doc.font }}', 'Helvetica Neue', Arial, Sans !important;
{% endif %}
{% if doc.font_size %}
font-size: {{ doc.font_size }} !important;
@@ -31,7 +31,7 @@ div.outer {
{% if doc.google_web_font_for_heading or doc.heading_font %}
h1, h2, h3, h4, h5 {
- font-family: '{{ doc.google_web_font_for_heading or doc.heading_font }}', Arial, 'Helvetica Neue' !important;
+ font-family: '{{ doc.google_web_font_for_heading or doc.heading_font }}', 'Helvetica Neue', Arial !important;
}
{% endif %}
{% if doc.heading_text_style %}
diff --git a/website/templates/html/slideshow.html b/website/templates/html/slideshow.html
index 86417245b73..e0e9038d9fd 100644
--- a/website/templates/html/slideshow.html
+++ b/website/templates/html/slideshow.html
@@ -5,10 +5,12 @@
{% for slide in obj.slides %}

+ {% if slide.heading or slide.description %}
- {{ slide.heading }}
- {{ slide.description }}
+ {% if slide.heading %} {{ slide.heading }}{% endif %}
+ {% if slide.heading %} {{ slide.description }} {% endif %}
+ {% endif %}
{% endfor %}
diff --git a/website/templates/pages/attributions.html b/website/templates/pages/attributions.html
index 2d195ba9cd6..9e4b50ddce1 100644
--- a/website/templates/pages/attributions.html
+++ b/website/templates/pages/attributions.html
@@ -12,7 +12,7 @@
{% block content %}
- This website is made using these Awesome Open Source Projects
+ This website is made using these awesome Open Source projects
@@ -37,6 +37,10 @@
| Apache HTTPD web server |
The Number One HTTP Server On The Internet. |
+
+ | Memcached |
+ Free & open source, high-performance, distributed memory object caching system. |
+
| Python Programming Language |
The "batteries included" language that lets you write elegant code, quickly.
Python Libraries:
@@ -80,6 +84,10 @@
| SlickGrid |
A lightning fast JavaScript grid/spreadsheet. |
+
+ | FullCalendar |
+ FullCalendar is a jQuery plugin that provides a full-sized, drag and drop calendar. |
+
| Flot Charting Library |
Attractive JavaScript plotting for jQuery. |
@@ -96,13 +104,37 @@
JSColor - Color Picker |
HTML/Javascript Color Picker. |
+
+ | QUnit |
+ A JavaScript Unit Testing framework. |
+
| Downloadify - Flash Download Widget |
A tiny javascript + Flash library that enables the creation and download of text files without server interaction. |
+
+
+ ERPNext License: GNU/General Public License
+
+ ERPNext - Open Source, web based ERP
+ Copyright © 2012, Web Notes Technologies Pvt Ltd, India
- Note: A link to this page must be easily accessible.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ For complete license see http://www.gnu.org/licenses/
+
+ Note: A link to this page must be easily accessible and all other ERPNext branding must remain as it is.
+
+ For more information please write to us at support@erpnext.com
{% endblock %}
\ No newline at end of file
|