Merge branch 'master' of github.com:webnotes/erpnext into production

This commit is contained in:
Nabin Hait
2012-12-12 12:58:22 +05:30
15 changed files with 179 additions and 182 deletions

View File

@@ -2,17 +2,17 @@
<div class="appframe-area"></div>
<div class="layout-main-section">
<div style="width: 48%; float: left;">
<h4><a href="#!List/Web Page">Web Page</a></h4>
<h5><a href="#List/Web Page">Web Page</a></h5>
<p class="help">Static (content) web page</p>
<br>
<h4><a href="#!List/Blog">Blog</a></h4>
<h5><a href="#List/Blog">Blog</a></h5>
<p class="help">Weblog (blog) entry</p>
</div>
<div style="width: 48%; float: right;">
<h4><a href="#!Form/Website Settings/Website Settings">Website Settings</a></h4>
<h5><a href="#Form/Website Settings/Website Settings">Website Settings</a></h5>
<p class="help">Setup of top navigation bar, footer and logo</p>
<br>
<h4><a href="#!Form/Style Settings/Style Settings">Style Settings</a></h4>
<h5><a href="#Form/Style Settings/Style Settings">Style Settings</a></h5>
<p class="help">Setup of fonts and background</p>
</div>
<div style="clear: both"></div>