From 977facf4e4783192f19dee33fdad3745cfec37c1 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 17 Jun 2016 11:28:19 +1000 Subject: [PATCH] clean up copy and styling of mailing list pref --- app/assets/stylesheets/common/base/user.scss | 2 -- app/assets/stylesheets/desktop/user.scss | 6 ++++++ config/locales/client.en.yml | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index 93c44cd1363..2e1f31b7446 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -279,5 +279,3 @@ and (max-width : 600px) { width: 100%; } } - - diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index ef10e3c6086..20422beaf5e 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -64,6 +64,12 @@ width: 520px; } + .pref-mailing-list-mode .controls { + select { + width: 400px; + } + } + .other .controls { select { width: 280px; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 9bc4c2a580f..e53038c639a 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -532,8 +532,8 @@ en: Muted topics and categories are not included in these emails. daily: "Send daily updates" individual: "Send an email for every new post" - many_per_day: "Send me an email for every new post (about {{dailyEmailEstimate}} per day)." - few_per_day: "Send me an email for every new post (less than 2 per day)." + many_per_day: "Send me an email for every new post (about {{dailyEmailEstimate}} per day)" + few_per_day: "Send me an email for every new post (about 2 per day)" watched_categories: "Watched" watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic." tracked_categories: "Tracked" @@ -679,7 +679,7 @@ en: always: "always" never: "never" email_digests: - title: "When I don't visit here, send me an email summary of popular topics and replies to:" + title: "When I don't visit here, send me an email summary of popular topics and replies" every_30_minutes: "every 30 minutes" every_hour: "hourly" daily: "daily"