From f931d6cb41720073e3ce8e284c1af855645bc8e4 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Wed, 8 Mar 2017 10:53:50 +0100 Subject: [PATCH] Use correct mixin to show icons --- app/assets/stylesheets/content/_links.sass | 4 ++-- app/assets/stylesheets/content/_notifications.sass | 7 +++---- app/assets/stylesheets/content/_table.sass | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/content/_links.sass b/app/assets/stylesheets/content/_links.sass index acc89bbfbc..b1bfc8e486 100644 --- a/app/assets/stylesheets/content/_links.sass +++ b/app/assets/stylesheets/content/_links.sass @@ -45,14 +45,14 @@ a background-position: 100% 50% background-repeat: no-repeat &.asc:after - @include icon-common + @include icon-font-common @extend .icon-sort-ascending:before margin-left: 5px font-size: 1.2em vertical-align: text-bottom &.desc:after - @include icon-common + @include icon-font-common @extend .icon-sort-descending:before margin-left: 5px font-size: 1.2em diff --git a/app/assets/stylesheets/content/_notifications.sass b/app/assets/stylesheets/content/_notifications.sass index 51599d47c8..97467b4077 100644 --- a/app/assets/stylesheets/content/_notifications.sass +++ b/app/assets/stylesheets/content/_notifications.sass @@ -99,7 +99,7 @@ $nm-upload-box-padding: rem-calc(15) rem-calc(25) border-color: $nm-color-border @mixin messages-icon($top:rem-calc(11), $left:rem-calc(10), $size:rem-calc(18)) - @include icon-common + @include icon-font-common position: absolute top: $top left: $left @@ -160,9 +160,8 @@ $nm-upload-box-padding: rem-calc(15) rem-calc(25) &.-info::before @extend %info-placeholder - &::before - @include messages-icon - @extend %nm-icon-info + @include messages-icon + @extend %nm-icon-info &.-upload padding: $nm-upload-box-padding diff --git a/app/assets/stylesheets/content/_table.sass b/app/assets/stylesheets/content/_table.sass index dc41216cdd..8239b7d6b9 100644 --- a/app/assets/stylesheets/content/_table.sass +++ b/app/assets/stylesheets/content/_table.sass @@ -114,14 +114,14 @@ table.generic-table .sort &.asc:after - @include icon-common + @include icon-font-common @extend .icon-sort-ascending:before margin-left: 5px font-size: 1.2em vertical-align: text-bottom &.desc:after - @include icon-common + @include icon-font-common @extend .icon-sort-descending:before margin-left: 5px font-size: 1.2em