From d737b2a33bf63f8d2c3d84d0649ed928bf91baaf Mon Sep 17 00:00:00 2001 From: davegandy Date: Wed, 12 Jun 2013 10:54:30 -0400 Subject: [PATCH] removing extra mixins from scss to make a straight port --- scss/_icons.scss | 1 - scss/_mixins.scss | 16 +--------------- src/assets/font-awesome/scss/_icons.scss | 1 - src/assets/font-awesome/scss/_mixins.scss | 16 +--------------- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/scss/_icons.scss b/scss/_icons.scss index 88622693f..16179266e 100644 --- a/scss/_icons.scss +++ b/scss/_icons.scss @@ -1,7 +1,6 @@ /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen * readers do not read off random characters that represent icons */ - .icon-glass:before { content: $glass; } .icon-music:before { content: $music; } .icon-search:before { content: $search; } diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 5987dd7ac..4c1a2da3a 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -1,4 +1,5 @@ // Mixins +// -------------------------- @mixin icon($icon) { @include icon-FontAwesome(); @@ -45,18 +46,3 @@ } } } - -@mixin animation($animation) { - -moz-animation: $animation; - -o-animation: $animation; - -webkit-animation: $animation; - animation: $animation; -} - -@mixin transform($transform) { - -webkit-transform: $transform; - -moz-transform: $transform; - -ms-transform: $transform; - -o-transform: $transform; - transform: $transform; -} diff --git a/src/assets/font-awesome/scss/_icons.scss b/src/assets/font-awesome/scss/_icons.scss index f91f81f2a..5febd993f 100644 --- a/src/assets/font-awesome/scss/_icons.scss +++ b/src/assets/font-awesome/scss/_icons.scss @@ -2,7 +2,6 @@ --- /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen * readers do not read off random characters that represent icons */ - {% for icon in icons %}{% for alias in icon.aliases %} .icon-{{ alias }}:before,{% endfor %} .icon-{{ icon.id }}:before { content: ${{ icon.id }}; }{% endfor %} diff --git a/src/assets/font-awesome/scss/_mixins.scss b/src/assets/font-awesome/scss/_mixins.scss index 5987dd7ac..4c1a2da3a 100644 --- a/src/assets/font-awesome/scss/_mixins.scss +++ b/src/assets/font-awesome/scss/_mixins.scss @@ -1,4 +1,5 @@ // Mixins +// -------------------------- @mixin icon($icon) { @include icon-FontAwesome(); @@ -45,18 +46,3 @@ } } } - -@mixin animation($animation) { - -moz-animation: $animation; - -o-animation: $animation; - -webkit-animation: $animation; - animation: $animation; -} - -@mixin transform($transform) { - -webkit-transform: $transform; - -moz-transform: $transform; - -ms-transform: $transform; - -o-transform: $transform; - transform: $transform; -}