From a5871b6dd18cc938cd6bcd6589d913c6c8f078ff Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 7 Nov 2018 14:18:55 -0500
Subject: [PATCH] Rename conflicting SCSS mixin

---
 app/assets/stylesheets/common/base/_topic-list.scss  | 2 +-
 app/assets/stylesheets/common/foundation/mixins.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 26bee81e6e8..e29caaaae42 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -252,7 +252,7 @@ ol.category-breadcrumb {
 }
 
 .d-icon-thumbtack.unpinned {
-  @include rotate(180deg, 1);
+  @include fa-rotate(180deg, 1);
   color: $primary;
   /* because it is rotated, right becomes left! */
   padding-left: 3px;
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 0fde66a24b7..a4fa84fcd68 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -87,7 +87,7 @@ $breakpoints: (
   appearance: none;
 }
 
-@mixin rotate($degrees, $rotation) {
+@mixin fa-rotate($degrees, $rotation) {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
   -webkit-transform: rotate($degrees);
   -ms-transform: rotate($degrees);