diff --git a/packages/dotcom-ui-base-styles/sass/_mixins.scss b/packages/dotcom-ui-base-styles/sass/_mixins.scss index 31c6541bd..425bf3298 100644 --- a/packages/dotcom-ui-base-styles/sass/_mixins.scss +++ b/packages/dotcom-ui-base-styles/sass/_mixins.scss @@ -25,9 +25,9 @@ $spacing-unit: 20px; // Primitives @import 'grid/main'; -@import 'images/main'; @import 'typography/main'; @import 'util/main'; +@import '@financial-times/o-icons/main'; @import '@financial-times/o-colors/main'; @import '@financial-times/o-normalise/main'; @import '@financial-times/o-visual-effects/main'; diff --git a/packages/dotcom-ui-base-styles/sass/images/_mixins.scss b/packages/dotcom-ui-base-styles/sass/images/_mixins.scss deleted file mode 100644 index 37c967c63..000000000 --- a/packages/dotcom-ui-base-styles/sass/images/_mixins.scss +++ /dev/null @@ -1,36 +0,0 @@ -@mixin nGetImage($image-type, $image-name, $color: null, $container-width: 128, $container-height: null) { - @if $image-type == 'icon' { - @error 'We no longer support using nGetImage for icons. Please use o-icons’ oIconsGetIcon mixin instead (https://github.com/Financial-Times/o-icons/blob/v5.4.2/scss/_mixins.scss#L16).'; - } - - $url: 'https://www.ft.com/__origami/service/image/v2/images/raw/ft#{$image-type}:#{$image-name}'; - $query: '?source=next'; - - @if $color != null { - $color: str-slice(ie-hex-str($color), 4); - $query: $query + "&tint=%23#{$color},%23#{$color}"; - } - - @if ($container-height == null) { - $container-height: $container-width; - } - - background-color: transparent; - // scss-lint:disable DuplicateProperty - background-image: url($url + $query + '&format=svg'); - // IE 6/7/8 fallback. Uses the `\9` selector hack to target IE those versions. - // Hack is documented here: http://browserhacks.com/#hack-ab1bcc7b3a6544c99260f7608f8e845e - background-image: url($url + $query + '&format=png&width=#{$container-width}')\9; - // scss-lint:enable DuplicateProperty - background-position: 50%; - background-repeat: no-repeat; - background-size: contain; - display: inline-block; - /* stylelint-disable */ - height: $container-height + 0px; - /* stylelint-enable */ - vertical-align: baseline; - /* stylelint-disable */ - width: $container-width + 0px; - /* stylelint-enable */ -} diff --git a/packages/dotcom-ui-base-styles/sass/images/main.scss b/packages/dotcom-ui-base-styles/sass/images/main.scss deleted file mode 100644 index 45061edf7..000000000 --- a/packages/dotcom-ui-base-styles/sass/images/main.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import '@financial-times/o-icons/main'; -@import 'mixins';