Merge pull request twbs#368 from glebm/3-glebm

Update from sass-twitter-bootstrap and fix asset-path patch and javascripts [Bootstrap 3]

asseturl.patch

@@ -1,15 +1,19 @@
-diff --git a/vendor/assets/stylesheets/_variables.scss b/vendor/assets/stylesheets/_variables.scss
-index e29dc59..85f4d56 100644
---- a/vendor/assets/stylesheets/_variables.scss
-+++ b/vendor/assets/stylesheets/_variables.scss
-@@ -151,8 +151,8 @@ $zindexModal:             1050 !default;
-
- // Sprite icons path
- // -------------------------
--$iconSpritePath:          "../img/glyphicons-halflings.png" !default;
--$iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png" !default;
-+$iconSpritePath:          image-path("glyphicons-halflings.png") !default;
-+$iconWhiteSpritePath:     image-path("glyphicons-halflings-white.png") !default;
-
-
- // Input placeholder text color
+diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
+index b7dbdb6..ebcf0f4 100644
+--- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
++++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
+@@ -21,11 +21,11 @@
+ // Import the fonts
+ @font-face {
+   font-family: 'Glyphicons Halflings';
+-  src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot');
+-  src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),
+-       url('#{$glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'),
+-       url('#{$glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'),
+-       url('#{$glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
++  src: url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.eot"));
++  src: url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix")) format('embedded-opentype'),
++       url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.woff")) format('woff'),
++       url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.ttf")) format('truetype'),
++       url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular")) format('svg');
+ }

update-bootstrap.sh

@@ -3,23 +3,25 @@
 ROOT=`pwd`"/vendor/assets"
 TMP='tmp/sass-twitter-bootstrap'
 # Pull down sass-twitter-bootstrap sources
-git clone https://github.com/jlong/sass-twitter-bootstrap.git tmp/sass-twitter-bootstrap
+git clone https://github.com/jlong/sass-twitter-bootstrap.git tmp/sass-twitter-bootstrap --branch '3.0.0-wip'
 # Copy lib/ to stylesheets/
 mkdir -p $ROOT/stylesheets/bootstrap
 cp -r $TMP/lib/* $ROOT/stylesheets/bootstrap
-# Copy js/ to javascripts/
-cp -r $TMP/js/* $ROOT/javascripts
+# Copy js/ to javascripts/bootstrap
+cp -r $TMP/js/* $ROOT/javascripts/bootstrap
 # Copy img/ to images/
 cp -r $TMP/img/* $ROOT/images
+# Copy fonts/ to fonts/
+cp -r $TMP/fonts/* $ROOT/fonts
 # Remove tests
-rm -r $ROOT/javascripts/tests
-rm -r $ROOT/stylesheets/bootstrap/tests
+rm -r $ROOT/javascripts/bootstrap/tests
 
-# Patch the asset-url in _variables.scss
-patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch
+# Patch the asset-url in _glyphicons.scss
+patch -f vendor/assets/stylesheets/bootstrap/_glyphicons.scss < asseturl.patch
+rm $ROOT/stylesheets/bootstrap/_glyphicons.scss.orig
 
 # Patch paths in bootstrap.scss and responsive.scss
-sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss
+sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/bootstrap.scss
 rm $ROOT/stylesheets/bootstrap/*.bak
 
-rm -rf $TMP
+rm -rf $TMP