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

This commit is contained in:
Anand Doshi
2012-12-20 12:42:53 +05:30
7 changed files with 13 additions and 8 deletions

View File

@@ -4,7 +4,7 @@
<title>{% block title %}{% endblock %}</title>
<meta name="generator" content="wnframework">
<script type="text/javascript" src="lib/js/lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="js/all-web.js"></script>
<script type="text/javascript" src="js/all-web.min.js"></script>
<script type="text/javascript" src="js/wn-web.js"></script>
<link type="text/css" rel="stylesheet" href="css/all-web.css">
<link type="text/css" rel="stylesheet" href="css/wn-web.css">

View File

@@ -20,11 +20,11 @@
<table border="0" class="login-box">
<tbody>
<tr>
<td style="text-align: right;">Login Id</td>
<td style="text-align: right; padding: 3px;">Login Id</td>
<td><input id="login_id" type="text" style="width: 180px"/></td>
</tr>
<tr>
<td style="text-align: right;">Password</td>
<td style="text-align: right; padding: 3px;">Password</td>
<td><input id="password" type="password" style="width: 180px" /></td>
</tr>
<tr>