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

FIX: apply fa-fw on class instead of icon name

This commit is contained in:
Joffrey JAFFEUX 2018-04-12 10:56:32 +02:00 committed by GitHub
parent 6e46f81123
commit deab0486fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/select-kit/components/category-drop.js.es6
View File

@ -18,8 +18,8 @@ export default ComboBoxComponent.extend({
noCategoriesLabel: I18n.t("categories.no_subcategory"), noCategoriesLabel: I18n.t("categories.no_subcategory"),
mutateAttributes() {}, mutateAttributes() {},
fullWidthOnMobile: true, fullWidthOnMobile: true,
caretDownIcon: "caret-right fa-fw", caretDownIcon: "caret-right",
caretUpIcon: "caret-down fa-fw", caretUpIcon: "caret-down",
init() { init() {
this._super(); this._super();

4
app/assets/javascripts/select-kit/components/combo-box.js.es6
View File

@ -7,8 +7,8 @@ export default SingleSelectComponent.extend({
autoFilterable: true, autoFilterable: true,
headerComponent: "combo-box/combo-box-header", headerComponent: "combo-box/combo-box-header",
caretUpIcon: "caret-up fa-fw", caretUpIcon: "caret-up",
caretDownIcon: "caret-down fa-fw", caretDownIcon: "caret-down",
clearable: false, clearable: false,
computeHeaderContent() { computeHeaderContent() {

4
app/assets/javascripts/select-kit/components/group-dropdown.js.es6
View File

@ -7,8 +7,8 @@ export default ComboBoxComponent.extend({
classNames: "group-dropdown", classNames: "group-dropdown",
content: Ember.computed.alias("groups"), content: Ember.computed.alias("groups"),
tagName: "li", tagName: "li",
caretDownIcon: "caret-right fa-fw", caretDownIcon: "caret-right",
caretUpIcon: "caret-down fa-fw", caretUpIcon: "caret-down",
allowAutoSelectFirst: false, allowAutoSelectFirst: false,
valueAttribute: 'name', valueAttribute: 'name',

4
app/assets/javascripts/select-kit/components/tag-drop.js.es6
View File

@ -19,8 +19,8 @@ export default ComboBoxComponent.extend({
categoryStyle: Ember.computed.alias("siteSettings.category_style"), categoryStyle: Ember.computed.alias("siteSettings.category_style"),
mutateAttributes() {}, mutateAttributes() {},
fullWidthOnMobile: true, fullWidthOnMobile: true,
caretDownIcon: "caret-right fa-fw", caretDownIcon: "caret-right",
caretUpIcon: "caret-down fa-fw", caretUpIcon: "caret-down",
@computed("tagId") @computed("tagId")
noTagsSelected() { noTagsSelected() {

2
app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
View File

@ -2,4 +2,4 @@
{{{label}}} {{{label}}}
</span> </span>
{{d-icon caretIcon class="caret-icon"}} {{d-icon caretIcon class="caret-icon fa-fw"}}

2
app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
View File

@ -10,4 +10,4 @@
</button> </button>
{{/if}} {{/if}}
{{d-icon caretIcon class="caret-icon"}} {{d-icon caretIcon class="caret-icon fa-fw"}}

2
app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
View File

@ -2,4 +2,4 @@
{{{label}}} {{{label}}}
</span> </span>
{{d-icon caretIcon class="caret-icon"}} {{d-icon caretIcon class="caret-icon fa-fw"}}