Merge V2 branch

2015-02-24 14:05:43 +10:00
parent 5adaad5bf8
commit 138494c4b1
82 changed files with 8952 additions and 4985 deletions
--- a/admin/css/base.css
+++ b/admin/css/base.css
@@ -424,7 +424,8 @@ textarea {
    vertical-align: top !important;
 }

-input[type=text], input[type=password], textarea, select, .vTextField {
+input[type=text], input[type=password], input[type=email], input[type=url], input[type=number],
+textarea, select, .vTextField {
    border: 1px solid #ccc;
 }