From ce09adb5ff1bcc154666b05699ef0ac75f1a6fdc Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 20 Mar 2015 12:47:35 -0700 Subject: [PATCH] some tweaks to Feature this Topic --- .../common/base/topic-admin-menu.scss | 2 ++ config/locales/client.en.yml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss index 27d16c202..3301a1ea0 100644 --- a/app/assets/stylesheets/common/base/topic-admin-menu.scss +++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss @@ -35,6 +35,8 @@ .button { width: 33%; display: inline-block; + vertical-align: top; + margin-top: 15px; } .desc { display: inline-block; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index fe118eb8c..3294e75a4 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1024,23 +1024,23 @@ en: unpin: "Remove this topic from the top of the {{categoryLink}} category." pin_note: "Users can unpin the topic individually for themselves." already_pinned: - zero: "No topic currently pinned in {{categoryLink}}." - one: "Topic currently pinned in {{categoryLink}}: 1." - other: "Topics currently pinned in {{categoryLink}}: {{count}}." + zero: "There are no topics pinned in {{categoryLink}}." + one: "Topics currently pinned in {{categoryLink}}: 1" + other: "Topics currently pinned in {{categoryLink}}: {{count}}" pin_globally: "Make this topic appear at the top of all topic lists, until a staff member unpins it." confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?" unpin_globally: "Remove this topic from the top of all topic lists." global_pin_note: "Users can unpin the topic individually for themselves." already_pinned_globally: - zero: "No topic currently pinned globally." - one: "Topic currently pinned globally: 1." - other: "Topics currently pinned globally: {{count}}." + zero: "There are no topics pinned globally." + one: "Topics currently pinned globally: 1" + other: "Topics currently pinned globally: {{count}}." make_banner: "Make this topic into a banner that appears at the top of all pages." remove_banner: "Remove the banner that appears at the top of all pages." banner_note: "Users can dismiss the banner by closing it. Only one topic can be bannered at any given time." already_banner: - zero: "There is currently no banner topic." - one: "There is currently a banner topic." + zero: "There is no banner topic." + one: "There is currently a banner topic." inviting: "Inviting..." automatically_add_to_groups_optional: "This invite also includes access to these groups: (optional, admin only)"