Rename conflicting SCSS mixin

2018-11-07 14:18:55 -05:00 · 2018-11-07 14:18:55 -05:00 · a5871b6dd1
parent 52440415c5
commit a5871b6dd1
2 changed files with 2 additions and 2 deletions
--- 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;
--- 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);