Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

style: Merge css of social login/register buttons.

This commit is contained in:
Umair Khan 2017-11-17 12:36:45 +05:00 committed by Tim Abbott
parent 1e3aa55f4f
commit 06b57e8512
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
static/styles/portico-signin.css
View File

@ -572,8 +572,7 @@ html {
margin-bottom: 10px;
}
button.login-google-button,
button.login-github-button {
button.login-social-button {
width: 328px;
padding-left: 35px;
@ -586,21 +585,18 @@ button.login-github-button {
color: #fff;
}
button.login-google-button,
button.login-github-button {
button.login-social-button {
background-color: #fff;
box-shadow: 0px 1px 3px hsla(0, 0%, 0%, 0.3), 0px 0px 5px hsla(0, 0%, 0%, 0.1);
color: hsl(0, 0%, 34%);
}
button.login-google-button:hover,
button.login-github-button:hover {
button.login-social-button:hover {
background-color: hsl(0, 0%, 98%);
box-shadow: 1px 2px 5px hsla(0, 0%, 0%, 0.2);
}
button.login-google-button:active,
button.login-github-button:active {
button.login-social-button:active {
background-color: hsl(0, 0%, 93%);
box-shadow: 0px 1px 1px hsla(0, 0%, 0%, 0.3);
}

4
templates/zerver/accounts_home.html
View File

@ -80,7 +80,7 @@ $(function () {
<div class="register-google">
<form class="form-inline" action="{{ url('zerver.views.auth.start_google_oauth2') }}" method="get">
<input type='hidden' name='is_signup' value='1' />
<button class="login-google-button full-width">{{ _('Sign up with Google') }}</button>
<button class="login-social-button login-google-button full-width">{{ _('Sign up with Google') }}</button>
</form>
</div>
{% endif %}
@ -88,7 +88,7 @@ $(function () {
{% if github_auth_enabled %}
<div class="login-github">
<form class="form-inline github-wrapper" action="{{ url('signup-social', args=('github',)) }}" method="get">
<button class="login-github-button github">{{ _('Sign up with GitHub') }}</button>
<button class="login-social-button login-github-button github">{{ _('Sign up with GitHub') }}</button>
</form>
</div>
{% endif %}

4
templates/zerver/login.html
View File

@ -125,7 +125,7 @@ common.autofocus('#id_username');
{% if google_auth_enabled %}
<div class="login-google">
<form class="form-inline" action="{{ url('zerver.views.auth.start_google_oauth2') }}" method="get">
<button class="login-google-button full-width">{{ _('Sign in with Google') }}</button>
<button class="login-social-button login-google-button full-width">{{ _('Sign in with Google') }}</button>
</form>
</div>
{% endif %}
@ -133,7 +133,7 @@ common.autofocus('#id_username');
{% if github_auth_enabled %}
<div class="login-github">
<form class="form-inline github-wrapper" action="{{ url('login-social', args=('github',)) }}" method="get">
<button class="login-github-button github">{{ _('Sign in with GitHub') }}</button>
<button class="login-social-button login-github-button github">{{ _('Sign in with GitHub') }}</button>
</form>
</div>
{% endif %}