From 0445445727423f03d0dfc457560250172a7dcfb3 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 18 Nov 2014 12:45:40 +0100
Subject: fix escaping

---
 assets/stylesheets/bootstrap/_carousel.scss         | 4 ++--
 assets/stylesheets/bootstrap/mixins/_hide-text.scss | 2 +-
 assets/stylesheets/bootstrap/mixins/_opacity.scss   | 2 +-
 tasks/converter/less_conversion.rb                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap/_carousel.scss
index 3a9853b..b4a5312 100644
--- a/assets/stylesheets/bootstrap/_carousel.scss
+++ b/assets/stylesheets/bootstrap/_carousel.scss
@@ -27,8 +27,8 @@
 
     // WebKit CSS3 transforms for supported devices
     @media all and (transform-3d), (-webkit-transform-3d) {
-      @include transition-transform(~'0.6s ease-in-out');
-      @include backface-visibility(~'hidden');
+      @include transition-transform(0.6s ease-in-out);
+      @include backface-visibility(hidden);
       @include perspective(1000);
 
       &.next,
diff --git a/assets/stylesheets/bootstrap/mixins/_hide-text.scss b/assets/stylesheets/bootstrap/mixins/_hide-text.scss
index 45db638..c59d736 100644
--- a/assets/stylesheets/bootstrap/mixins/_hide-text.scss
+++ b/assets/stylesheets/bootstrap/mixins/_hide-text.scss
@@ -8,7 +8,7 @@
 
 // Deprecated as of v3.0.1 (will be removed in v4)
 @mixin hide-text() {
-  font: #{0/0} a;
+  font: 0/0 a;
   color: transparent;
   text-shadow: none;
   background-color: transparent;
diff --git a/assets/stylesheets/bootstrap/mixins/_opacity.scss b/assets/stylesheets/bootstrap/mixins/_opacity.scss
index df088ad..88e9a57 100644
--- a/assets/stylesheets/bootstrap/mixins/_opacity.scss
+++ b/assets/stylesheets/bootstrap/mixins/_opacity.scss
@@ -4,5 +4,5 @@
   opacity: $opacity;
   // IE8 filter
   $opacity-ie: ($opacity * 100);
-  filter: #{alpha(opacity=$opacity-ie)};
+  filter: alpha(opacity=$opacity-ie);
 }
diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb
index c78e655..4fded8c 100644
--- a/tasks/converter/less_conversion.rb
+++ b/tasks/converter/less_conversion.rb
@@ -495,7 +495,7 @@ SASS
     end
 
     def replace_escaping(less)
-      less = less.gsub(/~"([^"]+)"/, '#{\1}') # Get rid of ~"" escape
+      less = less.gsub(/~"([^"]+)"/, '\1').gsub(/~'([^']+)'/, '\1') # Get rid of ~"" escape
       less.gsub!(/\$\{([^}]+)\}/, '$\1') # Get rid of @{} escape
       less.gsub!(/"([^"\n]*)(\$[\w\-]+)([^"\n]*)"/, '"\1#{\2}\3"') # interpolate variable in string, e.g. url("$file-1x") => url("#{$file-1x}")
       less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape
-- 
cgit v1.2.3