From 81c545539e341e47eeb9663f450efd308bb69ed5 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 28 Feb 2013 18:32:40 -0600 Subject: [PATCH] Add (ui-only) Persona button to login modal --- .../discourse/templates/modal/login.js.handlebars | 2 ++ app/assets/stylesheets/components/buttons.css.scss | 6 ++++++ app/assets/stylesheets/foundation/variables.scss | 3 ++- config/locales/client.en.yml | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars index 638db920dc2..b98ac1d9fb8 100644 --- a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars +++ b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars @@ -16,6 +16,8 @@ {{#if Discourse.SiteSettings.enable_github_logins}} {{/if}} +
+

{{i18n login.or}} diff --git a/app/assets/stylesheets/components/buttons.css.scss b/app/assets/stylesheets/components/buttons.css.scss index 74fdda7391c..0f052094514 100755 --- a/app/assets/stylesheets/components/buttons.css.scss +++ b/app/assets/stylesheets/components/buttons.css.scss @@ -168,6 +168,12 @@ content: "g"; } } + &.persona { + background: $persona; + &:before { + content: "]"; + } + } } // Button Sizes diff --git a/app/assets/stylesheets/foundation/variables.scss b/app/assets/stylesheets/foundation/variables.scss index 4407937c81c..a6bdf11a978 100644 --- a/app/assets/stylesheets/foundation/variables.scss +++ b/app/assets/stylesheets/foundation/variables.scss @@ -124,6 +124,7 @@ $facebook: #3b5998 !default; $twitter: #00bced !default; $yahoo: #810293 !default; $github: #6d6d6d !default; +$persona: #606060 !default; // Layout dimensions @@ -174,4 +175,4 @@ $heart: #fa6c8d; $attention_bg: #e4f2f8; $attention_fg: #1aaae4; -$header-item-highlight: #ecf8f6; \ No newline at end of file +$header-item-highlight: #ecf8f6; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index ae45c00875e..4bd3c695483 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -251,6 +251,9 @@ en: github: title: "Log In with Github" message: "Authenticating with Github (make sure pop up blockers are not enabled)" + persona: + title: "Log In with Any Email Address (Mozilla Persona)" + message: "Authenticating with Persona (make sure pop up blockers are not enabled)" composer: saving_draft_tip: "saving"