Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anand Doshi 2012-02-08 11:06:12 +05:30
commit a685379d6b
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/website/css/website.css
View File

@ -45,6 +45,13 @@ header .topbar .container {
margin-bottom: 20px; margin-bottom: 20px;
} }
.web-main-section p,
.web-main-section h4,
.web-main-section h5,
.web-main-section pre {
margin-left: 9px;
}
.web-side-section { .web-side-section {
width: 30%; width: 30%;
float: right; float: right;

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

@ -19,7 +19,7 @@
</td> </td>
<td> <td>
<h4>{{ p.person_name }}</h4> <h4>{{ p.person_name }}</h4>
<div class="comment">{{ p.designation }}</div> <p class="field_description">{{ p.designation }}</p>
<div style="margin-bottom: 15px">{{ p.bio }}</div> <div style="margin-bottom: 15px">{{ p.bio }}</div>
</td> </td>
</tr> </tr>

2
version.num
View File

@ -1 +1 @@
364 367