codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUGFIX: Improve copy and correct instruction alignment

Browse source
This commit is contained in:
Sam 2014-01-13 10:11:40 +11:00
parent 2b64118df1
commit e076682bc6
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
View file

@ -139,18 +139,18 @@
<div class="controls"> <div class="controls">
<label>{{i18n user.watched_categories}}</label> <label>{{i18n user.watched_categories}}</label>
{{category-group categories=watchedCategories}} {{category-group categories=watchedCategories}}
<div class="instructions">{{i18n user.watched_categories_instructions}}</div>
</div> </div>
<div class="instructions">{{i18n user.watched_categories_instructions}}</div>
<div class="controls"> <div class="controls">
<label>{{i18n user.tracked_categories}}</label> <label>{{i18n user.tracked_categories}}</label>
{{category-group categories=trackedCategories}} {{category-group categories=trackedCategories}}
<div class="instructions">{{i18n user.tracked_categories_instructions}}</div>
</div> </div>
<div class="instructions">{{i18n user.tracked_categories_instructions}}</div>
<div class="controls"> <div class="controls">
<label>{{i18n user.muted_categories}}</label> <label>{{i18n user.muted_categories}}</label>
{{category-group categories=mutedCategories}} {{category-group categories=mutedCategories}}
<div class="instructions">{{i18n user.muted_categories_instructions}}</div>
</div> </div>
<div class="instructions">{{i18n user.muted_categories_instructions}}</div>
</div> </div>
<div class="control-group"> <div class="control-group">

3
app/assets/stylesheets/desktop/user.scss
View file

@ -43,8 +43,9 @@
} }
.instructions { .instructions {
color: $dark_gray; color: $dark_gray;
margin-left: 165px; margin-left: 160px;
margin-top: 5px; margin-top: 5px;
margin-bottom: 10px;
} }
.avatar { .avatar {
margin-left: 3px; margin-left: 3px;

6
config/locales/client.en.yml
View file

@ -230,11 +230,11 @@ en:
suspended_reason: "Reason: " suspended_reason: "Reason: "
watch_new_topics: "Automatically watch all new topics posted on the forum" watch_new_topics: "Automatically watch all new topics posted on the forum"
watched_categories: "Watched" watched_categories: "Watched"
watched_categories_instructions: "You will automatically watch all topics in these categories" watched_categories_instructions: "Same as Tracking, plus you will be notified of all new posts and topics."
tracked_categories: "Tracked" tracked_categories: "Tracked"
tracked_categories_instructions: "You will automatically receive notifications for topics in these categories" tracked_categories_instructions: "You will automatically track all new and existing topics providing you a count of unread and new posts"
muted_categories: "Muted" muted_categories: "Muted"
muted_categories_instructions: "You will automatically mute all topics in these categories" muted_categories_instructions: "You will not be notified of anything about this topic, and it will not appear on your unread tab."
messages: messages:
all: "All" all: "All"