Skip to content

Commit

Permalink
Remove the _font-url-prefixer function
Browse files Browse the repository at this point in the history
This function was not actually being utilized and was likely an artifact from
refactoring the `font-face` mixin.
  • Loading branch information
tysongach committed Feb 7, 2016
1 parent 34fe6c7 commit 2525d0e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 22 deletions.
1 change: 0 additions & 1 deletion core/_bourbon.scss
Expand Up @@ -12,7 +12,6 @@
@import "bourbon/functions/contains";
@import "bourbon/functions/contains-falsy";
@import "bourbon/functions/font-source-declaration";
@import "bourbon/functions/font-url-prefixer";
@import "bourbon/functions/is-length";
@import "bourbon/functions/is-light";
@import "bourbon/functions/is-number";
Expand Down
7 changes: 1 addition & 6 deletions core/bourbon/addons/_font-face.scss
Expand Up @@ -36,8 +36,6 @@
/// format("truetype");
/// }
///
/// @require {function} _font-url-prefixer
///
/// @require {function} _font-source-declaration
///
/// @require {function} _bourbon-get-setting
Expand All @@ -49,16 +47,13 @@
$file-formats: _bourbon-get-setting("global-font-file-formats")
) {

$font-url-prefix: _font-url-prefixer($asset-pipeline);

@font-face {
font-family: $font-family;
src: _font-source-declaration(
$font-family,
$file-path,
$asset-pipeline,
$file-formats,
$font-url-prefix
$file-formats
);
@content;
}
Expand Down
3 changes: 1 addition & 2 deletions core/bourbon/functions/_font-source-declaration.scss
Expand Up @@ -2,8 +2,7 @@
$font-family,
$file-path,
$asset-pipeline,
$file-formats,
$font-url) {
$file-formats) {

$src: ();

Expand Down
10 changes: 0 additions & 10 deletions core/bourbon/functions/_font-url-prefixer.scss

This file was deleted.

7 changes: 4 additions & 3 deletions spec/fixtures/functions/font-source-declaration.scss
@@ -1,10 +1,11 @@
@import "setup";
$file-formats: eot woff2 woff ttf svg;

$file-formats: ("eot", "woff2", "woff", "ttf", "svg");

.has-pipeline {
src: _font-source-declaration("a", "b", true, $file-formats, "/c");
src: _font-source-declaration("a", "b", true, $file-formats);
}

.no-pipeline {
src: _font-source-declaration("a", "b", false, $file-formats, "/c");
src: _font-source-declaration("a", "b", false, $file-formats);
}

0 comments on commit 2525d0e

Please sign in to comment.