From 4711cb471677d3e933f1f3bfd088d033374bd5fa Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 27 Mar 2013 12:22:53 -0400 Subject: [PATCH] Cleanup layout of login buttons --- .../javascripts/discourse/templates/modal/login.js.handlebars | 2 -- app/assets/stylesheets/application/login.css.scss | 1 + config/locales/client.cs.yml | 2 +- config/locales/client.da.yml | 4 ++-- config/locales/client.de.yml | 4 ++-- config/locales/client.en.yml | 4 ++-- config/locales/client.es.yml | 4 ++-- config/locales/client.fr.yml | 4 ++-- config/locales/client.id.yml | 4 ++-- config/locales/client.it.yml | 4 ++-- config/locales/client.pseudo.yml | 4 ++-- config/locales/client.zh_CN.yml | 2 +- config/locales/client.zh_TW.yml | 2 +- 13 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars index b608acdc75..693a22ed14 100644 --- a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars +++ b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars @@ -6,7 +6,6 @@ {{#if Discourse.SiteSettings.enable_facebook_logins}} {{/if}} -
{{#if Discourse.SiteSettings.enable_twitter_logins}} {{/if}} @@ -17,7 +16,6 @@ {{/if}} {{#if Discourse.SiteSettings.enable_persona_logins}} -
{{/if}} diff --git a/app/assets/stylesheets/application/login.css.scss b/app/assets/stylesheets/application/login.css.scss index 3c8f6cd200..70803093f0 100644 --- a/app/assets/stylesheets/application/login.css.scss +++ b/app/assets/stylesheets/application/login.css.scss @@ -6,6 +6,7 @@ #login-buttons { button { margin: 0 5px 5px 0; + min-width: 210px; } margin-top: 10px; margin-bottom: 20px; diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 149482d20c..225e6fb984 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -264,7 +264,7 @@ cs: title: "Přihlásit přes Github" message: "Autorizuji přes Github (ujistěte se, že nemáte zablokovaná popup okna)" 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)" composer: diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 8d827148d4..466f3be12f 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -259,8 +259,8 @@ da: title: "Log ind med Github" message: "Logger ind med Github (check at pop-op-blokering ikke er aktiv)" persona: - title: "Log ind med Mozilla Persona" - message: "Logger ind med Persona (check at pop-op-blokering ikke er aktiv)" + title: "Log ind med Persona" + message: "Logger ind med Mozilla Persona (check at pop-op-blokering ikke er aktiv)" composer: posting_not_on_topic: "Du svarer nu på emnet \"{{title}}\", men du ser i øjeblikket på et andet emne." diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 2c1d548414..edbf1ccd31 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -252,8 +252,8 @@ de: title: "Mit Github anmelden" message: "Authentisierung via Github (stelle sicher, dass Popup-Blocker deaktiviert sind)" persona: - title: "Mit Mozilla Persona anmelden" - message: "Authentisierung via Persona (stelle sicher, dass Popup-Blocker deaktiviert sind)" + title: "Mit Persona anmelden" + message: "Authentisierung via Mozilla Persona (stelle sicher, dass Popup-Blocker deaktiviert sind)" composer: saving_draft_tip: "speichert" diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 22a3c8785a..04e6b9c331 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -264,8 +264,8 @@ en: title: "Log In with Github" message: "Authenticating with Github (make sure pop up blockers are not enabled)" persona: - title: "Log In with Mozilla Persona" - message: "Authenticating with Persona (make sure pop up blockers are not enabled)" + title: "Log In with Persona" + message: "Authenticating with Mozilla Persona (make sure pop up blockers are not enabled)" composer: posting_not_on_topic: "You are replying to the topic \"{{title}}\", but you are currently viewing a different topic." diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index f358a327a0..d0763dca21 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -262,8 +262,8 @@ es: title: "Entrar con Github" message: "Autenticando con Github (asegúrate de desactivar cualquier bloqueador de pop ups)" persona: - title: "Entrar con Mozilla Persona" - message: "Autenticando con Persona (asegúrate de desactivar cualquier bloqueador de pop ups)" + title: "Entrar con Persona" + message: "Autenticando con Mozilla Persona (asegúrate de desactivar cualquier bloqueador de pop ups)" composer: posting_not_on_topic: "Estas respondiendo al tema \"{{title}}\", pero estas viendo un tema distinto." diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index bc43a174fb..aa735723bb 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -268,8 +268,8 @@ fr: title: "Connexion via GitHub" message: "Authentification via GitHub (assurez-vous que les popups ne soient pas bloquées)" persona: - title: "Connexion via Mozilla Persona" - message: "Authentification via Persona (assurez-vous que les popups ne soient pas bloquées)" + title: "Connexion via Persona" + message: "Authentification via Mozilla Persona (assurez-vous que les popups ne soient pas bloquées)" composer: posting_not_on_topic: "Vous répondez à la discussion \"{{title}}\", mais vous êtes actuellement en train de consulter une autre discussion." diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 4c3e2255f9..45d9d6da18 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -252,8 +252,8 @@ id: title: "Log In with Github" message: "Authenticating with Github (make sure pop up blockers are not enabled)" persona: - title: "Log In with Mozilla Persona" - message: "Authenticating with Persona (make sure pop up blockers are not enabled)" + title: "Log In with Persona" + message: "Authenticating with Mozilla Persona (make sure pop up blockers are not enabled)" composer: saving_draft_tip: "saving" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 459258b795..ebe06dd015 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -261,8 +261,8 @@ it: title: "Log In con Github" message: "Autenticazione con Github (l'apertura di pop up deve essere permessa dal browser)" persona: - title: "Log In con Mozilla Persona" - message: "Autenticazione con Persona (l'apertura di pop up deve essere permessa dal browser)" + title: "Log In con Persona" + message: "Autenticazione con Mozilla Persona (l'apertura di pop up deve essere permessa dal browser)" composer: posting_not_on_topic: "Stai rispondendo al topic \"{{title}}\", ma al momento stai visualizzando un topic diverso." diff --git a/config/locales/client.pseudo.yml b/config/locales/client.pseudo.yml index e8c8cd95c0..be06eeb61e 100644 --- a/config/locales/client.pseudo.yml +++ b/config/locales/client.pseudo.yml @@ -254,8 +254,8 @@ pseudo: message: '[[ Áůťĥéɳťíčáťíɳǧ ŵíťĥ Ǧíťĥůƀ (ɱáǩé šůřé ƿóƿ ůƿ ƀłóčǩéřš ářé ɳóť éɳáƀłéď) ]]' persona: - title: '[[ Łóǧ Íɳ ŵíťĥ Ϻóžíłłá Рéřšóɳá ]]' - message: '[[ Áůťĥéɳťíčáťíɳǧ ŵíťĥ Рéřšóɳá (ɱáǩé šůřé ƿóƿ ůƿ ƀłóčǩéřš ářé ɳóť + title: '[[ Łóǧ Íɳ ŵíťĥ Рéřšóɳá ]]' + message: '[[ Áůťĥéɳťíčáťíɳǧ ŵíťĥ Ϻóžíłłá Рéřšóɳá (ɱáǩé šůřé ƿóƿ ůƿ ƀłóčǩéřš ářé ɳóť éɳáƀłéď) ]]' composer: posting_not_on_topic: '[[ Ýóů ářé řéƿłýíɳǧ ťó ťĥé ťóƿíč "{{title}}", ƀůť ýóů diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 6a184a5b13..10bc71b0fb 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -261,7 +261,7 @@ zh_CN: title: "使用 Github 帐号登录" message: "使用 Github 帐号验证登录（请确保没有禁止浏览器弹出对话框）" persona: - title: "使用 Mozilla Persona 帐号登录" + title: "使用 Persona 帐号登录" message: "使用 Mozilla Persona 帐号验证登录（请确保没有禁止浏览器弹出对话框）" sina: title: "使用新浪帐号登录" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index bb718dfb80..7650fbb621 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -261,7 +261,7 @@ zh_TW: title: "使用 Github 帳號登錄" message: "使用 Github 帳號驗證登錄（請確保沒有禁止浏覽器彈出對話框）" persona: - title: "使用 Mozilla Persona 帳號登錄" + title: "使用 Persona 帳號登錄" message: "使用 Mozilla Persona 帳號驗證登錄（請確保沒有禁止浏覽器彈出對話框）" sina: title: "使用新浪帳號登錄"