diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-07-29 14:58:37 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-07-29 14:58:37 -0400 |
commit | 3f8dda6f5ad676c976fd5ae575a6790fdb505449 (patch) | |
tree | 015a739989103ce38481176fd5d55f5f703789cb /webapp/sass | |
parent | 748fdef1fbded624a786533e8f065b91a047b91c (diff) | |
download | chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.tar.gz chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.tar.bz2 chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.zip |
PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660)
* EE: Add Google and Office365 SSO through OAuth2
* Add localization strings
* Text tweaks for PLT-3633
* Added sign-up button for Office 365
* Updated some error messages and a bit of licensing
* Updated sign-in method section in user settings to include Google and Office365
* Added more localization strings
Diffstat (limited to 'webapp/sass')
-rw-r--r-- | webapp/sass/routes/_signup.scss | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss index 804e4c890..8315f8890 100644 --- a/webapp/sass/routes/_signup.scss +++ b/webapp/sass/routes/_signup.scss @@ -256,6 +256,23 @@ } } + &.office365 { + background: #0079d6; + + &:hover { + background: darken(#0079d6, 10%); + } + + span { + vertical-align: middle; + } + + .icon { + margin-left:-10px; + background-image: url('../images/office365Logo.png'); + } + } + &.ldap { background: #dd4b39; |