Skip to content

Commit f8ff977

Browse files
authored
Merge pull request #1522 from hackmdio/fix/btn-social
fix: replace btn-social with btn-login-method
2 parents 54d1742 + ebec2c0 commit f8ff977

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

public/css/cover.css

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,15 +397,31 @@ select {
397397
color: #fff;
398398
}
399399

400-
a.btn.btn-social > i.oauth-icon {
400+
/* add btn-login-method replaced of btn-social, to avoid ad block delete the login button */
401+
.btn-login-method {
402+
padding-left: 61px;
403+
position: relative;
404+
text-align: left;
405+
white-space: nowrap;
406+
overflow: hidden;
407+
text-overflow: ellipsis;
408+
}
409+
.btn-login-method.btn-lg :first-child {
410+
line-height:45px;
411+
width:45px;
412+
font-size:1.8em;
413+
}
414+
.btn-login-method>:first-child {position:absolute;left:0;top:0;bottom:0;width:32px;line-height:34px;font-size:1.6em;text-align:center;border-right:1px solid rgba(0,0,0,0.2)}
415+
416+
a.btn.btn-login-method > i.oauth-icon {
401417
display: inline-flex;
402418
height: 45px;
403419
width: 45px;
404420
line-height: inherit;
405421
padding: 6px;
406422
}
407423

408-
a.btn.btn-social > i.oauth-icon > img {
424+
a.btn.btn-login-method > i.oauth-icon > img {
409425
width: 100%;
410426
height: 100%;
411427
line-height: inherit;

public/views/shared/signin-modal.ejs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,52 +9,52 @@
99
</div>
1010
<div class="modal-body" style="text-align: center;">
1111
<% if (authProviders.facebook) { %>
12-
<a href="<%- serverURL %>/auth/facebook" class="btn btn-lg btn-block btn-social btn-facebook">
12+
<a href="<%- serverURL %>/auth/facebook" class="btn btn-lg btn-block btn-login-method btn-facebook">
1313
<i class="fa fa-facebook"></i> <%= __('Sign in via %s', 'Facebook') %>
1414
</a>
1515
<% } %>
1616
<% if (authProviders.twitter) { %>
17-
<a href="<%- serverURL %>/auth/twitter" class="btn btn-lg btn-block btn-social btn-twitter">
17+
<a href="<%- serverURL %>/auth/twitter" class="btn btn-lg btn-block btn-login-method btn-twitter">
1818
<i class="fa fa-twitter"></i> <%= __('Sign in via %s', 'Twitter') %>
1919
</a>
2020
<% } %>
2121
<% if (authProviders.github) { %>
22-
<a href="<%- serverURL %>/auth/github" class="btn btn-lg btn-block btn-social btn-github">
22+
<a href="<%- serverURL %>/auth/github" class="btn btn-lg btn-block btn-login-method btn-github">
2323
<i class="fa fa-github"></i> <%= __('Sign in via %s', 'GitHub') %>
2424
</a>
2525
<% } %>
2626
<% if (authProviders.bitbucket) { %>
27-
<a href="<%- serverURL %>/auth/bitbucket" class="btn btn-lg btn-block btn-social btn-bitbucket">
27+
<a href="<%- serverURL %>/auth/bitbucket" class="btn btn-lg btn-block btn-login-method btn-bitbucket">
2828
<i class="fa fa-bitbucket"></i> <%= __('Sign in via %s', 'Bitbucket') %>
2929
</a>
3030
<% } %>
3131
<% if (authProviders.gitlab) { %>
32-
<a href="<%- serverURL %>/auth/gitlab" class="btn btn-lg btn-block btn-social btn-gitlab">
32+
<a href="<%- serverURL %>/auth/gitlab" class="btn btn-lg btn-block btn-login-method btn-gitlab">
3333
<i class="fa fa-gitlab"></i> <%= __('Sign in via %s', 'GitLab') %>
3434
</a>
3535
<% } %>
3636
<% if (authProviders.mattermost) { %>
37-
<a href="<%- serverURL %>/auth/mattermost" class="btn btn-lg btn-block btn-social btn-mattermost">
37+
<a href="<%- serverURL %>/auth/mattermost" class="btn btn-lg btn-block btn-login-method btn-mattermost">
3838
<i class="oauth-icon"><img alt="mattermost-logo" src="<%- serverURL %>/images/mattermost-logo.svg" /></i> <%= __('Sign in via %s', 'Mattermost') %>
3939
</a>
4040
<% } %>
4141
<% if (authProviders.dropbox) { %>
42-
<a href="<%- serverURL %>/auth/dropbox" class="btn btn-lg btn-block btn-social btn-dropbox">
42+
<a href="<%- serverURL %>/auth/dropbox" class="btn btn-lg btn-block btn-login-method btn-dropbox">
4343
<i class="fa fa-dropbox"></i> <%= __('Sign in via %s', 'Dropbox') %>
4444
</a>
4545
<% } %>
4646
<% if (authProviders.google) { %>
47-
<a href="<%- serverURL %>/auth/google" class="btn btn-lg btn-block btn-social btn-google">
47+
<a href="<%- serverURL %>/auth/google" class="btn btn-lg btn-block btn-login-method btn-google">
4848
<i class="fa fa-google"></i> <%= __('Sign in via %s', 'Google') %>
4949
</a>
5050
<% } %>
5151
<% if (authProviders.saml) { %>
52-
<a href="<%- serverURL %>/auth/saml" class="btn btn-lg btn-block btn-social btn-success">
52+
<a href="<%- serverURL %>/auth/saml" class="btn btn-lg btn-block btn-login-method btn-success">
5353
<i class="fa fa-users"></i> <%= __('Sign in via %s', 'SAML') %>
5454
</a>
5555
<% } %>
5656
<% if (authProviders.oauth2) { %>
57-
<a href="<%- serverURL %>/auth/oauth2" class="btn btn-lg btn-block btn-social btn-soundcloud">
57+
<a href="<%- serverURL %>/auth/oauth2" class="btn btn-lg btn-block btn-login-method btn-soundcloud">
5858
<i class="fa fa-mail-forward"></i> <%= __('Sign in via %s', authProviders.oauth2ProviderName || 'OAuth2') %>
5959
</a>
6060
<% } %>

0 commit comments

Comments
 (0)