Skip to content

DEV: Update a few more icon names, bump rack dependency #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 25, 2025
Merged

DEV: Update a few more icon names, bump rack dependency #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393bd50
DEV: update deprecated icon names (#28)
tyb-talks Feb 6, 2025
160540f
bump rack from 3.1.8 to 3.1.10 (#29)
dependabot[bot] Feb 12, 2025
ea37b42
Merge branch 'paviliondev:main' into main
pmusaraj Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GEM
racc
prettier_print (1.2.1)
racc (1.8.1)
rack (3.1.8)
rack (3.1.10)
rainbow (3.1.1)
regexp_parser (2.9.2)
rubocop (1.69.0)
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/discourse/templates/admin-multilingual.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
class="right btn btn-icon-text"
rel="noreferrer noopener"
>
{{d-icon "file-alt"}}
{{d-icon "file-lines"}}
<span class="d-button-label">{{i18n
"multilingual.documentation"
}}</span>
Expand All @@ -30,7 +30,7 @@
{{d-button
action=(route-action "showSettings")
label="admin.plugins.change_settings_short"
icon="cog"
icon="gear"
}}
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/discourse/templates/components/admin-language.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
{{#if this.removing}}
{{loading-spinner size="small"}}
{{else}}
{{d-icon "times"}}
{{d-icon "xmark"}}
{{/if}}
{{/d-button}}
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/discourse/templates/components/admin-translation.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{{#if this.removing}}
{{loading-spinner size="small"}}
{{else}}
{{d-icon "times"}}
{{d-icon "xmark"}}
{{i18n "multilingual.translations.remove"}}
{{/if}}
</DButton>
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/discourse/templates/components/content-tag-groups-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class="btn-danger"
action=(action "destroy")
disabled=this.changingContentTags
icon="far-trash-alt"
icon="far-trash-can"
label="tagging.groups.delete"
}}

Expand All @@ -37,7 +37,7 @@
{{d-button
class="btn-danger"
action=(action "destroyContentTags")
icon="far-trash-alt"
icon="far-trash-can"
disabled=this.changingContentTags
label="tagging.groups.content_tags.delete.btn"
}}
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/select-kit/components/content-languages-dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ export default DropdownSelectBox.extend({
content.forEach((l, i) => {
if (l.locale === param) {
set(l, "classNames", `${l.classNames} active`);
set(l, "icon", "times");
set(l, "icon", "xmark");
activeIndex = i;
} else if (l.icon === "times") {
} else if (l.icon === "xmark") {
set(l, "classNames", "guest-content-language");
set(l, "icon", null);
}
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/select-kit/components/content-languages-row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default SelectKitRowComponent.extend({
DiscourseURL.routeTo(
userPath(this.currentUser.username_lower + "/preferences/interface")
);
} else if (this.item.icon === "times") {
} else if (this.item.icon === "xmark") {
addParam(contentLanguageParam, null, { ctx: this });
} else if (!this.currentUser) {
addParam(contentLanguageParam, this.rowValue, { ctx: this });
Expand Down
Loading