about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-02-04 05:42:13 +0100
committerGitHub <noreply@github.com>2018-02-04 05:42:13 +0100
commit26f21fd5a03b1c6407cd81c58481288d06958ad3 (patch)
treeef7cf0e00f4bfddfff65d4c28d38fe082ec6de37 /app/javascript
parent9da81a16391edfcbda9c748dcd519fb3ebd765e5 (diff)
CAS + SAML authentication feature (#6425)
* Cas authentication feature

* Config

* Remove class_eval + Omniauth initializer

* Codeclimate review

* Codeclimate review 2

* Codeclimate review 3

* Remove uid/email reconciliation

* SAML authentication

* Clean up code

* Improve login form

* Fix code style issues

* Add locales
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/styles/mastodon/forms.scss18
1 files changed, 18 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 2bef53cff..dec7d2284 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -568,3 +568,21 @@ code {
     margin-bottom: 4px;
   }
 }
+
+.alternative-login {
+  margin-top: 20px;
+  margin-bottom: 20px;
+
+  h4 {
+    font-size: 16px;
+    color: $ui-base-lighter-color;
+    text-align: center;
+    margin-bottom: 20px;
+    border: 0;
+    padding: 0;
+  }
+
+  .button {
+    display: block;
+  }
+}