Merge branch 'develop' of github.com:gogits/gogs into develop

2 files changed, 13 insertions, 1 deletions

diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js
index c5fd719c..7ffef8af 100644
--- a/public/ng/js/gogs.js
+++ b/public/ng/js/gogs.js
@@ -753,10 +753,17 @@ function initAdmin() {
         if (v == 2) {
             $('.ldap').toggleShow();
             $('.smtp').toggleHide();
+            $('.pam').toggleHide();
         }
         if (v == 3) {
             $('.smtp').toggleShow();
             $('.ldap').toggleHide();
+            $('.pam').toggleHide();
+        }
+        if (v == 4) {
+            $('.pam').toggleShow();
+            $('.smtp').toggleHide();
+            $('.ldap').toggleHide();
         }
     });
 
diff --git a/public/ng/less/gogs/sign.less b/public/ng/less/gogs/sign.less
index 55a9ffbb..3950be03 100644
--- a/public/ng/less/gogs/sign.less
+++ b/public/ng/less/gogs/sign.less
@@ -25,6 +25,11 @@ The register and sign-in page style
   .form-label {
     width: 160px;
   }
+  .chk-label {
+    width: auto;
+    text-align: left;
+    margin-left: 176px;
+  }
   .alert{
     margin:0 30px 24px 30px;
   }
@@ -60,4 +65,4 @@ The register and sign-in page style
     background-color: #FFF;
     margin-left: -15px;
   }
-}
\ No newline at end of file
+}