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/login.css
+++ b/admin/css/login.css
@@ -29,17 +29,20 @@ body.login {
 }

 .login .form-row label {
-    float: left;
-    width: 9em;
    padding-right: 0.5em;
    line-height: 2em;
-    text-align: right;
    font-size: 1em;
+    clear: both;
    color: #333;
 }

 .login .form-row #id_username, .login .form-row #id_password {
-    width: 14em;
+    clear: both;
+    padding: 6px;
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
 }

 .login span.help {