From 6b9dd2965c5a892a51f4cfdf2a1d5ecc1597daf8 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 21 Aug 2013 13:46:35 +0200
Subject: [PATCH] fix glyphicons

---
 lib/bootstrap-sass/version.rb                        |  2 +-
 tasks/converter.rb                                   |  1 +
 vendor/assets/stylesheets/bootstrap/_glyphicons.scss | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
index d5993ce4..f2411b89 100644
--- a/lib/bootstrap-sass/version.rb
+++ b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION = '3.0.0.0'
-  BOOTSTRAP_SHA = '0759dc4119178954bd86f1c89800cbb027877e1c'
+  BOOTSTRAP_SHA = 'e143c3547241a1f92f54849ffbcb0745f3f8002c'
 end
diff --git a/tasks/converter.rb b/tasks/converter.rb
index b97b906f..7a7b9bae 100644
--- a/tasks/converter.rb
+++ b/tasks/converter.rb
@@ -111,6 +111,7 @@ class Converter
         file = extract_nested_rule file, 'a&'
       when 'glyphicons.less'
         file = replace_rules(file, '@font-face') { |rule|
+          rule = replace_all rule, /(\$icon-font-\w+)/, '#{\1}'
           replace_all rule, /url\(/, 'font-url('
         }
       end
diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
index d3b5cbd6..7614a7a5 100644
--- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
+++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
@@ -10,11 +10,11 @@
 // Import the fonts
 @font-face {
   font-family: 'Glyphicons Halflings';
-  src: font-url('$icon-font-path$icon-font-name.eot');
-  src: font-url('$icon-font-path$icon-font-name.eot?#iefix') format('embedded-opentype'),
-       font-url('$icon-font-path$icon-font-name.woff') format('woff'),
-       font-url('$icon-font-path$icon-font-name.ttf') format('truetype'),
-       font-url('$icon-font-path$icon-font-name.svg#glyphicons-halflingsregular') format('svg');
+  src: font-url('#{$icon-font-path}#{$icon-font-name}.eot');
+  src: font-url('#{$icon-font-path}#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
+       font-url('#{$icon-font-path}#{$icon-font-name}.woff') format('woff'),
+       font-url('#{$icon-font-path}#{$icon-font-name}.ttf') format('truetype'),
+       font-url('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular') format('svg');
 }
 
 // Catchall baseclass