diff --git a/less/login.less b/less/login.less index b756a6a..fefeb12 100644 --- a/less/login.less +++ b/less/login.less @@ -1,45 +1,91 @@ /* * Copyright © 2020 A Bunch Tell LLC. * * This file is part of WriteFreely. * * WriteFreely is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License, included * in the LICENSE file in this source code package. */ .row.signinbtns { - justify-content: space-evenly; + justify-content: center; font-size: 1em; margin-top: 2em; margin-bottom: 1em; + flex-wrap: wrap; .loginbtn { height: 40px; + margin: 0.5em; - &.btn.cta { + &.btn { box-sizing: border-box; font-size: 17px; + white-space: nowrap; + + img { + height: 1.5em; + vertical-align: middle; + } + } + + writeas-login, slack-login { + img { + margin-top: -0.2em; + } + } + + gitlab-login { + background-color: #fc6d26; + border-color: #fc6d26; + &:hover { + background-color: darken(#fc6d26, 5%); + border-color: darken(#fc6d26, 5%); + } + } + + gitea-login { + background-color: #2ecc71; + border-color: #2ecc71; + &:hover { + background-color: #2cc26b; + border-color: #2cc26b; + } + } + + slack-login, gitlab-login, gitea-login, generic-oauth-login { + font-size: 0.86em; + font-family: @sansFont; + } + + slack-login, generic-oauth-login { + color: @lightTextColor; + background-color: @lightNavBG; + border-color: @lightNavBorder; + &:hover { + background-color: @lightNavHoverBG; + } } } } .or { text-align: center; margin-bottom: 3.5em; p { display: inline-block; background-color: white; padding: 0 1em; } hr { margin-top: -1.6em; margin-bottom: 0; } hr.short { max-width: 30rem; } } \ No newline at end of file diff --git a/static/img/mark/writeas-white.png b/static/img/mark/writeas-white.png new file mode 100644 index 0000000..6c9b2cd Binary files /dev/null and b/static/img/mark/writeas-white.png differ diff --git a/templates/include/oauth.tmpl b/templates/include/oauth.tmpl index 6617fd0..9a8d05e 100644 --- a/templates/include/oauth.tmpl +++ b/templates/include/oauth.tmpl @@ -1,28 +1,37 @@ {{define "oauth-buttons"}} {{ if or .SlackEnabled .WriteAsEnabled .GitLabEnabled .GiteaEnabled .GenericEnabled }}
or
Please add an email address and/or passphrase so you can log in again later.
Change your account settings here.
These are your linked external accounts.
{{ range $oauth_account := .OauthAccounts }} {{ end }}Connect additional accounts to enable logging in with those providers, instead of using your username and password.
-