IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: more consistent setting/edit buttons (#13276)

Browse Source
This commit is contained in:
Kris 2021-06-03 18:33:36 -04:00 committed by GitHub
parent 9d8bc6a405
commit cd9941e0ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
View File

@ -8,7 +8,7 @@ export default DropdownSelectBoxComponent.extend({
actionsMapping: null, actionsMapping: null,
selectKitOptions: { selectKitOptions: {
icons: ["bars", "caret-down"], icons: ["wrench", "caret-down"],
showFullTitle: false, showFullTitle: false,
}, },
@ -18,7 +18,7 @@ export default DropdownSelectBoxComponent.extend({
id: "manageGroups", id: "manageGroups",
name: I18n.t("tagging.manage_groups"), name: I18n.t("tagging.manage_groups"),
description: I18n.t("tagging.manage_groups_description"), description: I18n.t("tagging.manage_groups_description"),
icon: "wrench", icon: "tags",
}, },
{ {
id: "uploadTags", id: "uploadTags",

4
app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
View File

@ -24,14 +24,14 @@
class="btn-default edit-category" class="btn-default edit-category"
action=editCategory action=editCategory
icon="wrench" icon="wrench"
label="category.edit"}} ariaLabel="category.edit"}}
{{/if}} {{/if}}
{{/unless}} {{/unless}}
{{/if}} {{/if}}
{{#if tag}} {{#if tag}}
{{#if showToggleInfo}} {{#if showToggleInfo}}
{{d-button icon="tag" class="btn-default" label="tagging.info" action=toggleInfo id="show-tag-info"}} {{d-button icon="wrench" class="btn-default" ariaLabel="tagging.info" action=toggleInfo id="show-tag-info"}}
{{/if}} {{/if}}
{{/if}} {{/if}}

2
app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
View File

@ -9,7 +9,7 @@ export default DropdownSelectBoxComponent.extend({
fixedCateoryPositions: setting("fixed_category_positions"), fixedCateoryPositions: setting("fixed_category_positions"),
selectKitOptions: { selectKitOptions: {
icon: "wrench", icons: ["wrench", "caret-down"],
showFullTitle: false, showFullTitle: false,
autoFilterable: false, autoFilterable: false,
filterable: false, filterable: false,

1
app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
View File

@ -29,7 +29,6 @@
flex: 0 0 100%; flex: 0 0 100%;
overflow: hidden; overflow: hidden;
font-size: $font-up-2; font-size: $font-up-2;
align-self: center;
margin-right: 0; margin-right: 0;
} }
} }

1
lib/svg_sprite/svg_sprite.rb
View File

@ -188,6 +188,7 @@ module SvgSprite
"sync", "sync",
"table", "table",
"tag", "tag",
"tags",
"tasks", "tasks",
"thermometer-three-quarters", "thermometer-three-quarters",
"thumbs-down", "thumbs-down",