From deab0486fa110093e037141805e28834a3d9815b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Apr 2018 10:56:32 +0200
Subject: [PATCH] FIX: apply fa-fw on class instead of icon name

---
 .../javascripts/select-kit/components/category-drop.js.es6    | 4 ++--
 app/assets/javascripts/select-kit/components/combo-box.js.es6 | 4 ++--
 .../javascripts/select-kit/components/group-dropdown.js.es6   | 4 ++--
 app/assets/javascripts/select-kit/components/tag-drop.js.es6  | 4 ++--
 .../components/category-drop/category-drop-header.hbs         | 2 +-
 .../templates/components/combo-box/combo-box-header.hbs       | 2 +-
 .../templates/components/tag-drop/tag-drop-header.hbs         | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index debffeb9668..cbfaa329611 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -18,8 +18,8 @@ export default ComboBoxComponent.extend({
   noCategoriesLabel: I18n.t("categories.no_subcategory"),
   mutateAttributes() {},
   fullWidthOnMobile: true,
-  caretDownIcon: "caret-right fa-fw",
-  caretUpIcon: "caret-down fa-fw",
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
 
   init() {
     this._super();
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js.es6
index 4e6e42a02bd..a43839a6eee 100644
--- a/app/assets/javascripts/select-kit/components/combo-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box.js.es6
@@ -7,8 +7,8 @@ export default SingleSelectComponent.extend({
   autoFilterable: true,
   headerComponent: "combo-box/combo-box-header",
 
-  caretUpIcon: "caret-up fa-fw",
-  caretDownIcon: "caret-down fa-fw",
+  caretUpIcon: "caret-up",
+  caretDownIcon: "caret-down",
   clearable: false,
 
   computeHeaderContent() {
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
index 4b8d7ab25db..b2939b02788 100644
--- a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
@@ -7,8 +7,8 @@ export default ComboBoxComponent.extend({
   classNames: "group-dropdown",
   content: Ember.computed.alias("groups"),
   tagName: "li",
-  caretDownIcon: "caret-right fa-fw",
-  caretUpIcon: "caret-down fa-fw",
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
   allowAutoSelectFirst: false,
   valueAttribute: 'name',
 
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
index 47e8a343a96..4e3768753cd 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -19,8 +19,8 @@ export default ComboBoxComponent.extend({
   categoryStyle: Ember.computed.alias("siteSettings.category_style"),
   mutateAttributes() {},
   fullWidthOnMobile: true,
-  caretDownIcon: "caret-right fa-fw",
-  caretUpIcon: "caret-down fa-fw",
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
 
   @computed("tagId")
   noTagsSelected() {
diff --git a/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
index 7928a3b94b9..7e3ea1baf4f 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
@@ -2,4 +2,4 @@
   {{{label}}}
 </span>
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
index c3a7aa14fb3..b13075d3f2d 100644
--- a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
@@ -10,4 +10,4 @@
   </button>
 {{/if}}
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
index 7928a3b94b9..7e3ea1baf4f 100644
--- a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
@@ -2,4 +2,4 @@
   {{{label}}}
 </span>
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}