Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: clean up some label and form inconsistencies, reduce excess bolding (#25701)

This commit is contained in:
Kris 2024-02-15 11:27:51 -05:00 committed by GitHub
parent cfdb461e9a
commit 9374baab93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/addon/components/watched-word-form.hbs
View File

@ -66,7 +66,7 @@
<label for="watched-case-sensitivity">{{i18n <label for="watched-case-sensitivity">{{i18n
"admin.watched_words.form.case_sensitivity_label" "admin.watched_words.form.case_sensitivity_label"
}}</label> }}</label>
<label class="case-sensitivity-checkbox"> <label class="case-sensitivity-checkbox checkbox-label">
<Input <Input
@type="checkbox" @type="checkbox"
@checked={{this.isCaseSensitive}} @checked={{this.isCaseSensitive}}

6
app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
View File

@ -236,7 +236,7 @@
</div> </div>
<div> <div>
<label> <label class="checkbox-label">
<Input <Input
@type="checkbox" @type="checkbox"
@checked={{this.buffered.multiple_grant}} @checked={{this.buffered.multiple_grant}}
@ -247,7 +247,7 @@
</div> </div>
<div> <div>
<label> <label class="checkbox-label">
<Input <Input
@type="checkbox" @type="checkbox"
@checked={{this.buffered.listable}} @checked={{this.buffered.listable}}
@ -258,7 +258,7 @@
</div> </div>
<div> <div>
<label> <label class="checkbox-label">
<Input <Input
@type="checkbox" @type="checkbox"
@checked={{this.buffered.show_posts}} @checked={{this.buffered.show_posts}}

4
app/assets/javascripts/admin/addon/templates/site-text-index.hbs
View File

@ -32,7 +32,7 @@
/> />
</div> </div>
<label> <label class="checkbox-label">
<input <input
id="toggle-overridden" id="toggle-overridden"
type="checkbox" type="checkbox"
@ -42,7 +42,7 @@
{{i18n "admin.site_text.show_overriden"}} {{i18n "admin.site_text.show_overriden"}}
</label> </label>
<label> <label class="checkbox-label">
<input <input
id="toggle-outdated" id="toggle-outdated"
type="checkbox" type="checkbox"

4
app/assets/javascripts/discourse/app/components/group-flair-inputs.hbs
View File

@ -11,7 +11,7 @@
@value="icon" @value="icon"
@selection={{this.model.flair_type}} @selection={{this.model.flair_type}}
/> />
<b>{{i18n "groups.flair_type.icon"}}</b> {{i18n "groups.flair_type.icon"}}
</label> </label>
<label class="radio-label" for="avatar-flair-image"> <label class="radio-label" for="avatar-flair-image">
@ -21,7 +21,7 @@
@value="image" @value="image"
@selection={{this.model.flair_type}} @selection={{this.model.flair_type}}
/> />
<b>{{i18n "groups.flair_type.image"}}</b> {{i18n "groups.flair_type.image"}}
</label> </label>
</div> </div>

8
app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
View File

@ -85,7 +85,7 @@
) )
}} }}
/> />
<label for="matching-title-only"> <label class="checkbox-label" for="matching-title-only">
{{i18n "search.advanced.filters.title"}} {{i18n "search.advanced.filters.title"}}
</label> </label>
</div> </div>
@ -103,7 +103,7 @@
) )
}} }}
/> />
<label for="matching-liked">{{i18n <label class="checkbox-label" for="matching-liked">{{i18n
"search.advanced.filters.likes" "search.advanced.filters.likes"
}}</label> }}</label>
</div> </div>
@ -122,7 +122,7 @@
) )
}} }}
/> />
<label for="matching-in-messages">{{i18n <label class="checkbox-label" for="matching-in-messages">{{i18n
"search.advanced.filters.private" "search.advanced.filters.private"
}}</label> }}</label>
</div> </div>
@ -140,7 +140,7 @@
) )
}} }}
/> />
<label for="matching-seen">{{i18n <label class="checkbox-label" for="matching-seen">{{i18n
"search.advanced.filters.seen" "search.advanced.filters.seen"
}}</label> }}</label>
</div> </div>

28
app/assets/javascripts/discourse/app/templates/review-index.hbs
View File

@ -18,7 +18,9 @@
<div class="reviewable-filters"> <div class="reviewable-filters">
<div class="reviewable-filter"> <div class="reviewable-filter">
<label class="filter-label">{{i18n "review.filters.status"}}</label> <label class="filter-label">
{{i18n "review.filters.status"}}
</label>
<ComboBox <ComboBox
@value={{this.filterStatus}} @value={{this.filterStatus}}
@content={{this.statuses}} @content={{this.statuses}}
@ -40,7 +42,9 @@
</span> </span>
<div class="reviewable-filter"> <div class="reviewable-filter">
<label class="filter-label">{{i18n "review.filters.type.title"}}</label> <label class="filter-label">
{{i18n "review.filters.type.title"}}
</label>
<ComboBox <ComboBox
@value={{this.filterType}} @value={{this.filterType}}
@content={{this.allTypes}} @content={{this.allTypes}}
@ -50,9 +54,9 @@
</div> </div>
<div class="reviewable-filter"> <div class="reviewable-filter">
<label class="filter-label">{{i18n <label class="filter-label">
"review.filters.priority.title" {{i18n "review.filters.priority.title"}}
}}</label> </label>
<ComboBox <ComboBox
@value={{this.filterPriority}} @value={{this.filterPriority}}
@content={{this.priorities}} @content={{this.priorities}}
@ -61,7 +65,9 @@
</div> </div>
<div class="reviewable-filter"> <div class="reviewable-filter">
<label class="filter-label">{{i18n "review.filters.category"}}</label> <label class="filter-label">
{{i18n "review.filters.category"}}
</label>
<CategoryChooser <CategoryChooser
@value={{this.filterCategoryId}} @value={{this.filterCategoryId}}
@onChange={{action (mut this.filterCategoryId)}} @onChange={{action (mut this.filterCategoryId)}}
@ -70,7 +76,9 @@
</div> </div>
<div class="reviewable-filter topic-filter"> <div class="reviewable-filter topic-filter">
<label class="filter-label">
{{i18n "review.filtered_reviewed_by"}} {{i18n "review.filtered_reviewed_by"}}
</label>
<EmailGroupUserChooser <EmailGroupUserChooser
@value={{this.filterReviewedBy}} @value={{this.filterReviewedBy}}
@onChange={{action "updateFilterReviewedBy"}} @onChange={{action "updateFilterReviewedBy"}}
@ -83,7 +91,9 @@
</div> </div>
<div class="reviewable-filter topic-filter"> <div class="reviewable-filter topic-filter">
<label class="filter-label">
{{i18n "review.filtered_user"}} {{i18n "review.filtered_user"}}
</label>
<EmailGroupUserChooser <EmailGroupUserChooser
@value={{this.filterUsername}} @value={{this.filterUsername}}
@onChange={{action "updateFilterUsername"}} @onChange={{action "updateFilterUsername"}}
@ -98,7 +108,9 @@
{{#if this.filterTopic}} {{#if this.filterTopic}}
<div class="reviewable-filter topic-filter"> <div class="reviewable-filter topic-filter">
<label class="filter-label">
{{i18n "review.filtered_topic"}} {{i18n "review.filtered_topic"}}
</label>
<DButton <DButton
@label="review.show_all_topics" @label="review.show_all_topics"
@icon="times" @icon="times"
@ -109,7 +121,9 @@
{{/if}} {{/if}}
<div class="reviewable-filter date-range"> <div class="reviewable-filter date-range">
<label class="filter-label">
{{i18n "review.date_filter"}} {{i18n "review.date_filter"}}
</label>
<DateTimeInputRange <DateTimeInputRange
@from={{this.filterFromDate}} @from={{this.filterFromDate}}
@to={{this.filterToDate}} @to={{this.filterToDate}}
@ -120,7 +134,9 @@
</div> </div>
<div class="reviewable-filter sort-order"> <div class="reviewable-filter sort-order">
<label class="filter-label">
{{i18n "review.order_by"}} {{i18n "review.order_by"}}
</label>
<ComboBox <ComboBox
@value={{this.filterSortOrder}} @value={{this.filterSortOrder}}
@content={{this.sortOrders}} @content={{this.sortOrders}}

1
app/assets/stylesheets/common/admin/admin_emojis.scss
View File

@ -7,7 +7,6 @@
text-align: right; text-align: right;
} }
#emoji-uploader { #emoji-uploader {
padding: 10px;
transition: box-shadow ease-in-out 0.25s; transition: box-shadow ease-in-out 0.25s;
} }
.uppy-is-drag-over { .uppy-is-drag-over {

3
app/assets/stylesheets/common/admin/backups.scss
View File

@ -107,4 +107,7 @@ button.ru {
margin: 1.25em 0 0; margin: 1.25em 0 0;
} }
} }
label {
font-weight: normal;
}
} }

3
app/assets/stylesheets/common/admin/staff_logs.scss
View File

@ -282,6 +282,9 @@ table.screened-ip-addresses {
.watched-words-uploader { .watched-words-uploader {
display: inline-block; display: inline-block;
label {
font-weight: normal;
}
} }
.watched-words-list { .watched-words-list {

9
app/assets/stylesheets/common/base/discourse.scss
View File

@ -140,6 +140,11 @@ span.relative-date {
white-space: nowrap; white-space: nowrap;
} }
legend {
color: var(--primary-high);
font-weight: bold;
}
label { label {
display: flex; display: flex;
margin-bottom: 5px; margin-bottom: 5px;
@ -587,8 +592,12 @@ textarea {
line-height: var(--line-height-large); line-height: var(--line-height-large);
} }
.control-group,
.controls { .controls {
margin-left: 0; margin-left: 0;
label {
font-weight: normal;
}
} }
} }

4
app/assets/stylesheets/common/base/search.scss
View File

@ -177,6 +177,10 @@
background-color: var(--tertiary-very-low); background-color: var(--tertiary-very-low);
} }
} }
.control-label {
font-weight: bold;
color: var(--primary-high);
}
} }
details.search-advanced-additional-options { details.search-advanced-additional-options {

1
app/assets/stylesheets/common/base/user.scss
View File

@ -304,7 +304,6 @@
width: auto; width: auto;
text-align: left; text-align: left;
font-weight: normal; font-weight: normal;
font-weight: bold;
} }
.instructions { .instructions {

1
app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/categories-modal.scss
View File

@ -35,6 +35,7 @@
padding: 0.75em 1em; padding: 0.75em 1em;
margin: 0; margin: 0;
flex-grow: 1; flex-grow: 1;
font-weight: normal;
input[type="checkbox"] { input[type="checkbox"] {
margin-right: 0; margin-right: 0;
} }

2
app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/tags-modal.scss
View File

@ -21,6 +21,7 @@
margin-bottom: 0; margin-bottom: 0;
min-width: 0; min-width: 0;
padding: 0.33em 0; padding: 0.33em 0;
font-weight: normal;
@include breakpoint(tablet) { @include breakpoint(tablet) {
// extra tappable space // extra tappable space
padding: 0.5em 0; padding: 0.5em 0;
@ -43,6 +44,5 @@
.sidebar-tags-form__tag-label-count { .sidebar-tags-form__tag-label-count {
color: var(--primary-medium); color: var(--primary-medium);
margin-left: 0.33em;
} }
} }