nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge

Browse Source 
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
This commit is contained in:
Anand Doshi
2012-03-27 19:37:10 +05:30
parent a30fbd004e c009450ef0
commit 2513e50dc4
17 changed files with 283 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/website/css/website.css
View File

@@ -14,6 +14,10 @@ h3 {
margin-bottom: 7px;
}
p, li {
line-height: 1.6em;
}
pre {
background-color: #F8F8F8;
border: 1px solid #CCCCCC;

30
erpnext/website/doctype/style_settings/style_settings.txt
View File

@@ -23,7 +23,7 @@
'name': '__common__',
'section_style': u'Simple',
'show_in_menu': 0,
'version': 15
'version': 18
},
# These values are common for all DocField
@@ -66,17 +66,6 @@
'permlevel': 1
},
# DocField
{
'colour': u'White:FFF',
'description': u'Solid background color (default light gray)',
'doctype': u'DocField',
'fieldname': u'background_color',
'fieldtype': u'Data',
'label': u'Background Color',
'permlevel': 0
},
# DocField
{
'colour': u'White:FFF',
@@ -89,13 +78,24 @@
'permlevel': 0
},
# DocField
{
'colour': u'White:FFF',
'description': u'Solid background color (default light gray)',
'doctype': u'DocField',
'fieldname': u'background_color',
'fieldtype': u'Data',
'label': u'Background Color',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'font',
'fieldtype': u'Select',
'label': u'Font',
'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nPontano Sans\nDroid Sans\nGill Sans',
'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans',
'permlevel': 0
},
@@ -115,7 +115,7 @@
'fieldname': u'heading_font',
'fieldtype': u'Select',
'label': u'Heading Font',
'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nPontano Sans\nDroid Sans\nGill Sans',
'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans',
'permlevel': 0
},
@@ -153,4 +153,4 @@
'permlevel': 0,
'print_hide': 1
}
]
]

2
erpnext/website/doctype/web_page/template.html
View File

@@ -23,6 +23,6 @@
<div style="clear: both"></div>
</div>
</div>
<div class="web-page-status">
<div class="web-page-status small">
Last Modified: {{ doc.updated }} <a href="#contact">Feedback</a>
</div>

2
erpnext/website/js/topbar.js
View File

@@ -112,6 +112,6 @@ erpnext.Footer = Class.extend({
});
$(document).bind('startup', function() {
// erpnext.footer = new erpnext.Footer();
erpnext.footer = new erpnext.Footer();
erpnext.navbar.navbar = new erpnext.navbar.Navbar();
})