Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup layout of login buttons

This commit is contained in:
Neil Lalonde 2013-03-27 12:22:53 -04:00
parent d9539225f8
commit 4711cb4716
13 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/modal/login.js.handlebars
View File

@ -6,7 +6,6 @@
{{#if Discourse.SiteSettings.enable_facebook_logins}} {{#if Discourse.SiteSettings.enable_facebook_logins}}
<button class="btn btn-social facebook" title="{{i18n login.facebook.title}}" {{action "facebookLogin" target="view"}}>{{i18n login.facebook.title}}</button> <button class="btn btn-social facebook" title="{{i18n login.facebook.title}}" {{action "facebookLogin" target="view"}}>{{i18n login.facebook.title}}</button>
{{/if}} {{/if}}
<br>
{{#if Discourse.SiteSettings.enable_twitter_logins}} {{#if Discourse.SiteSettings.enable_twitter_logins}}
<button class="btn btn-social twitter" title="{{i18n login.twitter.title}}" {{action "twitterLogin" target="view"}}>{{i18n login.twitter.title}}</button> <button class="btn btn-social twitter" title="{{i18n login.twitter.title}}" {{action "twitterLogin" target="view"}}>{{i18n login.twitter.title}}</button>
{{/if}} {{/if}}
@ -17,7 +16,6 @@
<button class="btn btn-social github" title="{{i18n login.github.title}}" {{action "githubLogin" target="view"}}>{{i18n login.github.title}}</button> <button class="btn btn-social github" title="{{i18n login.github.title}}" {{action "githubLogin" target="view"}}>{{i18n login.github.title}}</button>
{{/if}} {{/if}}
{{#if Discourse.SiteSettings.enable_persona_logins}} {{#if Discourse.SiteSettings.enable_persona_logins}}
<br>
<button class="btn btn-social persona" title="{{i18n login.persona.title}}" {{action "personaLogin" target="view"}}>{{i18n login.persona.title}}</button> <button class="btn btn-social persona" title="{{i18n login.persona.title}}" {{action "personaLogin" target="view"}}>{{i18n login.persona.title}}</button>
{{/if}} {{/if}}
</div> </div>

1
app/assets/stylesheets/application/login.css.scss
View File

@ -6,6 +6,7 @@
#login-buttons { #login-buttons {
button { button {
margin: 0 5px 5px 0; margin: 0 5px 5px 0;
min-width: 210px;
} }
margin-top: 10px; margin-top: 10px;
margin-bottom: 20px; margin-bottom: 20px;

2
config/locales/client.cs.yml
View File

@ -264,7 +264,7 @@ cs:
title: "Přihlásit přes Github" title: "Přihlásit přes Github"
message: "Autorizuji přes Github (ujistěte se, že nemáte zablokovaná popup okna)" message: "Autorizuji přes Github (ujistěte se, že nemáte zablokovaná popup okna)"
persona: persona:
title: "Přihlásit přes Mozilla Persona" title: "Přihlásit přes Persona"
message: "Autorizuji přes Mozilla Persona (ujistěte se, že nemáte zablokovaná popup okna)" message: "Autorizuji přes Mozilla Persona (ujistěte se, že nemáte zablokovaná popup okna)"
composer: composer:

4
config/locales/client.da.yml
View File

@ -259,8 +259,8 @@ da:
title: "Log ind med Github" title: "Log ind med Github"
message: "Logger ind med Github (check at pop-op-blokering ikke er aktiv)" message: "Logger ind med Github (check at pop-op-blokering ikke er aktiv)"
persona: persona:
title: "Log ind med Mozilla Persona" title: "Log ind med Persona"
message: "Logger ind med Persona (check at pop-op-blokering ikke er aktiv)" message: "Logger ind med Mozilla Persona (check at pop-op-blokering ikke er aktiv)"
composer: composer:
posting_not_on_topic: "Du svarer nu på emnet \"{{title}}\", men du ser i øjeblikket på et andet emne." posting_not_on_topic: "Du svarer nu på emnet \"{{title}}\", men du ser i øjeblikket på et andet emne."

4
config/locales/client.de.yml
View File

@ -252,8 +252,8 @@ de:
title: "Mit Github anmelden" title: "Mit Github anmelden"
message: "Authentisierung via Github (stelle sicher, dass Popup-Blocker deaktiviert sind)" message: "Authentisierung via Github (stelle sicher, dass Popup-Blocker deaktiviert sind)"
persona: persona:
title: "Mit Mozilla Persona anmelden" title: "Mit Persona anmelden"
message: "Authentisierung via Persona (stelle sicher, dass Popup-Blocker deaktiviert sind)" message: "Authentisierung via Mozilla Persona (stelle sicher, dass Popup-Blocker deaktiviert sind)"
composer: composer:
saving_draft_tip: "speichert" saving_draft_tip: "speichert"

4
config/locales/client.en.yml
View File

@ -264,8 +264,8 @@ en:
title: "Log In with Github" title: "Log In with Github"
message: "Authenticating with Github (make sure pop up blockers are not enabled)" message: "Authenticating with Github (make sure pop up blockers are not enabled)"
persona: persona:
title: "Log In with Mozilla Persona" title: "Log In with Persona"
message: "Authenticating with Persona (make sure pop up blockers are not enabled)" message: "Authenticating with Mozilla Persona (make sure pop up blockers are not enabled)"
composer: composer:
posting_not_on_topic: "You are replying to the topic \"{{title}}\", but you are currently viewing a different topic." posting_not_on_topic: "You are replying to the topic \"{{title}}\", but you are currently viewing a different topic."

4
config/locales/client.es.yml
View File

@ -262,8 +262,8 @@ es:
title: "Entrar con Github" title: "Entrar con Github"
message: "Autenticando con Github (asegúrate de desactivar cualquier bloqueador de pop ups)" message: "Autenticando con Github (asegúrate de desactivar cualquier bloqueador de pop ups)"
persona: persona:
title: "Entrar con Mozilla Persona" title: "Entrar con Persona"
message: "Autenticando con Persona (asegúrate de desactivar cualquier bloqueador de pop ups)" message: "Autenticando con Mozilla Persona (asegúrate de desactivar cualquier bloqueador de pop ups)"
composer: composer:
posting_not_on_topic: "Estas respondiendo al tema \"{{title}}\", pero estas viendo un tema distinto." posting_not_on_topic: "Estas respondiendo al tema \"{{title}}\", pero estas viendo un tema distinto."

4
config/locales/client.fr.yml
View File

@ -268,8 +268,8 @@ fr:
title: "Connexion via GitHub" title: "Connexion via GitHub"
message: "Authentification via GitHub (assurez-vous que les popups ne soient pas bloquées)" message: "Authentification via GitHub (assurez-vous que les popups ne soient pas bloquées)"
persona: persona:
title: "Connexion via Mozilla Persona" title: "Connexion via Persona"
message: "Authentification via Persona (assurez-vous que les popups ne soient pas bloquées)" message: "Authentification via Mozilla Persona (assurez-vous que les popups ne soient pas bloquées)"
composer: composer:
posting_not_on_topic: "Vous répondez à la discussion \"{{title}}\", mais vous êtes actuellement en train de consulter une autre discussion." posting_not_on_topic: "Vous répondez à la discussion \"{{title}}\", mais vous êtes actuellement en train de consulter une autre discussion."

4
config/locales/client.id.yml
View File

@ -252,8 +252,8 @@ id:
title: "Log In with Github" title: "Log In with Github"
message: "Authenticating with Github (make sure pop up blockers are not enabled)" message: "Authenticating with Github (make sure pop up blockers are not enabled)"
persona: persona:
title: "Log In with Mozilla Persona" title: "Log In with Persona"
message: "Authenticating with Persona (make sure pop up blockers are not enabled)" message: "Authenticating with Mozilla Persona (make sure pop up blockers are not enabled)"
composer: composer:
saving_draft_tip: "saving" saving_draft_tip: "saving"

4
config/locales/client.it.yml
View File

@ -261,8 +261,8 @@ it:
title: "Log In con Github" title: "Log In con Github"
message: "Autenticazione con Github (l'apertura di pop up deve essere permessa dal browser)" message: "Autenticazione con Github (l'apertura di pop up deve essere permessa dal browser)"
persona: persona:
title: "Log In con Mozilla Persona" title: "Log In con Persona"
message: "Autenticazione con Persona (l'apertura di pop up deve essere permessa dal browser)" message: "Autenticazione con Mozilla Persona (l'apertura di pop up deve essere permessa dal browser)"
composer: composer:
posting_not_on_topic: "Stai rispondendo al topic \"{{title}}\", ma al momento stai visualizzando un topic diverso." posting_not_on_topic: "Stai rispondendo al topic \"{{title}}\", ma al momento stai visualizzando un topic diverso."

4
config/locales/client.pseudo.yml
View File

@ -254,8 +254,8 @@ pseudo:
message: '[[ Áůťĥéɳťíčáťíɳǧ ŵíťĥ Ǧíťĥůƀ (ɱáǩé šůřé ƿóƿ ůƿ ƀłóčǩéřš ářé ɳóť message: '[[ Áůťĥéɳťíčáťíɳǧ ŵíťĥ Ǧíťĥůƀ (ɱáǩé šůřé ƿóƿ ůƿ ƀłóčǩéřš ářé ɳóť
éɳáƀłéď) ]]' éɳáƀłéď) ]]'
persona: persona:
title: '[[ Łóǧ Íɳ ŵíťĥ Ϻóžíłłá Рéřšóɳá ]]' title: '[[ Łóǧ Íɳ ŵíťĥ Рéřšóɳá ]]'
message: '[[ Áůťĥéɳťíčáťíɳǧ ŵíťĥ Рéřšóɳá (ɱáǩé šůřé ƿóƿ ůƿ ƀłóčǩéřš ářé ɳóť message: '[[ Áůťĥéɳťíčáťíɳǧ ŵíťĥ Ϻóžíłłá Рéřšóɳá (ɱáǩé šůřé ƿóƿ ůƿ ƀłóčǩéřš ářé ɳóť
éɳáƀłéď) ]]' éɳáƀłéď) ]]'
composer: composer:
posting_not_on_topic: '[[ Ýóů ářé řéƿłýíɳǧ ťó ťĥé ťóƿíč "{{title}}", ƀůť ýóů posting_not_on_topic: '[[ Ýóů ářé řéƿłýíɳǧ ťó ťĥé ťóƿíč "{{title}}", ƀůť ýóů

2
config/locales/client.zh_CN.yml
View File

@ -261,7 +261,7 @@ zh_CN:
title: "使用 Github 帐号登录" title: "使用 Github 帐号登录"
message: "使用 Github 帐号验证登录（请确保没有禁止浏览器弹出对话框）" message: "使用 Github 帐号验证登录（请确保没有禁止浏览器弹出对话框）"
persona: persona:
title: "使用 Mozilla Persona 帐号登录" title: "使用 Persona 帐号登录"
message: "使用 Mozilla Persona 帐号验证登录（请确保没有禁止浏览器弹出对话框）" message: "使用 Mozilla Persona 帐号验证登录（请确保没有禁止浏览器弹出对话框）"
sina: sina:
title: "使用新浪帐号登录" title: "使用新浪帐号登录"

2
config/locales/client.zh_TW.yml
View File

@ -261,7 +261,7 @@ zh_TW:
title: "使用 Github 帳號登錄" title: "使用 Github 帳號登錄"
message: "使用 Github 帳號驗證登錄（請確保沒有禁止浏覽器彈出對話框）" message: "使用 Github 帳號驗證登錄（請確保沒有禁止浏覽器彈出對話框）"
persona: persona:
title: "使用 Mozilla Persona 帳號登錄" title: "使用 Persona 帳號登錄"
message: "使用 Mozilla Persona 帳號驗證登錄（請確保沒有禁止浏覽器彈出對話框）" message: "使用 Mozilla Persona 帳號驗證登錄（請確保沒有禁止浏覽器彈出對話框）"
sina: sina:
title: "使用新浪帳號登錄" title: "使用新浪帳號登錄"