stylesheets/toolkit/_fonts.scss in toolkit-2.0.0 vs stylesheets/toolkit/_fonts.scss in toolkit-2.0.1

@@ -3,11 +3,11 @@
 //////////////////////////////
 @mixin enable-ligatures($extend: null) {
   $extend: if($extend != null, $extend, toolkit-get('ligature extend'));
 
   @if $extend {
-    @include toolkit-placeholder('enable ligatures') {
+    @include dynamic-extend('enable ligatures') {
       @include enable-ligatures;
     }
   }
   @else {
     -webkit-font-feature-settings:"liga","dlig";
@@ -54,22 +54,20 @@
       $font-stack: append($font-stack, $font-src, 'comma');
     }
 
   }
 
-  @at-root {
-    @font-face {
-      font-family: $name;
-      font-weight: $weight;
-      font-style: $style;
-      @if $eot {
-        src: $eot;
-      }
-      @if length($font-stack) > 0 {
-        src: $font-stack;
-      }
+  @font-face {
+    font-family: $name;
+    font-weight: $weight;
+    font-style: $style;
+    @if $eot {
+      src: $eot;
     }
+    @if length($font-stack) > 0 {
+      src: $font-stack;
+    }
   }
 }
 
 //////////////////////////////
 // Icon Font
@@ -88,11 +86,11 @@
 
 @mixin icon-font--core($extend: null) {
   $extend: if($extend != null, $extend, toolkit-get('icon font extend'));
 
   @if $extend  {
-    @include toolkit-placeholder('icon font core') {
+    @include dynamic-extend('icon font core') {
       @include icon-font--core(false);
     }
   }
   @else {
     font-style: normal;
@@ -115,10 +113,10 @@
   $duration: if($duration != null, $duration, toolkit-get('fade in duration'));
   $loading: if($loading != null, $loading, toolkit-get('fade in loading class'));
   $extend: if($extend != null, $extend, toolkit-get('fade in extend'));
 
   @if $extend == true and $duration == toolkit-get('fade in duration') and $loading == toolkit-get('fade in loading class') {
-    @include toolkit-placeholder('content fade in') {
+    @include dynamic-extend('content fade in') {
       @include content-fade-in($extend: false);
     }
   }
   @else {
     opacity: 1;
\ No newline at end of file