Permalink
Browse files

update bootstrap-sass to 2.2.2.0

  • Loading branch information...
1 parent 8cee61f commit 9d55f4a8f5594a01a206de25fb0f89c53bd5eaae @hlb hlb committed Dec 25, 2012
Showing with 835 additions and 397 deletions.
  1. +0 −117 ...ruby/compass_extensions/bootstrap-sass-2.2.1.0/vendor/assets/stylesheets/bootstrap/_popovers.scss
  2. +0 −63 ...ruby/compass_extensions/bootstrap-sass-2.2.1.0/vendor/assets/stylesheets/bootstrap/bootstrap.scss
  3. +54 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/CHANGELOG.md
  4. +3 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/Gemfile
  5. 0 lib/ruby/compass_extensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/LICENSE
  6. +2 −2 lib/ruby/compass_extensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/README.md
  7. +20 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/Rakefile
  8. +15 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/asseturl.patch
  9. +15 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/bootstrap-sass.gemspec
  10. 0 lib/ruby/compass_extensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/lib/bootstrap-sass.rb
  11. 0 ...ensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/lib/bootstrap-sass/compass_functions.rb
  12. 0 ...compass_extensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/lib/bootstrap-sass/engine.rb
  13. 0 ...xtensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/lib/bootstrap-sass/rails_functions.rb
  14. 0 ...ompass_extensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/templates/project/manifest.rb
  15. 0 ...ompass_extensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/templates/project/styles.scss
  16. +13 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/test/compilation_test.rb
  17. +5 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/test/gemfiles/sass_3_2.gemfile
  18. +5 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/test/gemfiles/sass_head.gemfile
  19. +7 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/test/test_helper.rb
  20. +25 −0 lib/ruby/compass_extensions/bootstrap-sass-2.2.2.0/update-bootstrap.sh
  21. BIN ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/images/glyphicons-halflings-white.png
  22. BIN ...s/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/images/glyphicons-halflings.png
  23. +12 −1 ...ns/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-affix.js
  24. +12 −1 ...ns/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-alert.js
  25. +12 −1 ...s/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-button.js
  26. +11 −2 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-carousel.js
  27. +15 −4 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-collapse.js
  28. +16 −3 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-dropdown.js
  29. +12 −1 ...ns/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-modal.js
  30. +14 −3 .../{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-popover.js
  31. +13 −2 ...bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-scrollspy.js
  32. +12 −1 ...ions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-tab.js
  33. +12 −1 .../{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-tooltip.js
  34. +1 −1 ...ootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-transition.js
  35. +23 −10 ...bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap-typeahead.js
  36. 0 ...tensions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/javascripts/bootstrap.js
  37. 0 ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap-responsive.scss
  38. 0 ...nsions/{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap.scss
  39. 0 ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_accordion.scss
  40. +14 −0 ...bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_alerts.scss
  41. +5 −5 ...trap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
  42. +27 −42 ...ap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_button-groups.scss
  43. +5 −7 ...ootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_buttons.scss
  44. +15 −15 ...otstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_carousel.scss
  45. 0 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_close.scss
  46. +3 −0 .../{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_code.scss
  47. 0 ...-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_component-animations.scss
  48. +5 −9 ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
  49. +12 −8 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_forms.scss
  50. 0 .../{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_grid.scss
  51. 0 ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_hero-unit.scss
  52. +25 −15 ...ap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_labels-badges.scss
  53. 0 ...ootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_layouts.scss
  54. 0 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_media.scss
  55. +3 −3 ...bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_mixins.scss
  56. +1 −1 ...bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_modals.scss
  57. +22 −4 ...bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_navbar.scss
  58. +6 −0 .../{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_navs.scss
  59. 0 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_pager.scss
  60. 0 ...strap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_pagination.scss
  61. +129 −0 ...ruby/compass_extensions/bootstrap-sass-2.2.2.0/vendor/assets/stylesheets/bootstrap/_popovers.scss
  62. 0 ...ap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
  63. +82 −4 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_reset.scss
  64. 0 ...2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss
  65. 0 ...-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss
  66. 0 ....2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss
  67. 0 ...ass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss
  68. 0 ...-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
  69. 0 ...trap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
  70. 0 ...ootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_sprites.scss
  71. +36 −35 ...bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_tables.scss
  72. 0 ...strap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
  73. 0 ...ootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_tooltip.scss
  74. +29 −21 .../{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_type.scss
  75. 0 ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_utilities.scss
  76. +7 −7 ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_variables.scss
  77. 0 ...{bootstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/_wells.scss
  78. +63 −0 ...ruby/compass_extensions/bootstrap-sass-2.2.2.0/vendor/assets/stylesheets/bootstrap/bootstrap.scss
  79. +17 −8 ...tstrap-sass-2.2.1.0 → bootstrap-sass-2.2.2.0}/vendor/assets/stylesheets/bootstrap/responsive.scss
@@ -1,117 +0,0 @@
-//
-// Popovers
-// --------------------------------------------------
-
-
-.popover {
- position: absolute;
- top: 0;
- left: 0;
- z-index: $zindexPopover;
- display: none;
- width: 236px;
- padding: 1px;
- background-color: $popoverBackground;
- -webkit-background-clip: padding-box;
- -moz-background-clip: padding;
- background-clip: padding-box;
- border: 1px solid #ccc;
- border: 1px solid rgba(0,0,0,.2);
- @include border-radius(6px);
- @include box-shadow(0 5px 10px rgba(0,0,0,.2));
-
- // Offset the popover to account for the popover arrow
- &.top { margin-top: -10px; }
- &.right { margin-left: 10px; }
- &.bottom { margin-top: 10px; }
- &.left { margin-left: -10px; }
-
-}
-
-.popover-title {
- margin: 0; // reset heading margin
- padding: 8px 14px;
- font-size: 14px;
- font-weight: normal;
- line-height: 18px;
- background-color: $popoverTitleBackground;
- border-bottom: 1px solid darken($popoverTitleBackground, 5%);
- @include border-radius(5px 5px 0 0);
-}
-
-.popover-content {
- padding: 9px 14px;
- p, ul, ol {
- margin-bottom: 0;
- }
-}
-
-// Arrows
-.popover .arrow,
-.popover .arrow:after {
- position: absolute;
- display: inline-block;
- width: 0;
- height: 0;
- border-color: transparent;
- border-style: solid;
-}
-.popover .arrow:after {
- content: "";
- z-index: -1;
-}
-
-.popover {
- &.top .arrow {
- bottom: -$popoverArrowWidth;
- left: 50%;
- margin-left: -$popoverArrowWidth;
- border-width: $popoverArrowWidth $popoverArrowWidth 0;
- border-top-color: $popoverArrowColor;
- &:after {
- border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth 0;
- border-top-color: $popoverArrowOuterColor;
- bottom: -1px;
- left: -$popoverArrowOuterWidth;
- }
- }
- &.right .arrow {
- top: 50%;
- left: -$popoverArrowWidth;
- margin-top: -$popoverArrowWidth;
- border-width: $popoverArrowWidth $popoverArrowWidth $popoverArrowWidth 0;
- border-right-color: $popoverArrowColor;
- &:after {
- border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth $popoverArrowOuterWidth 0;
- border-right-color: $popoverArrowOuterColor;
- bottom: -$popoverArrowOuterWidth;
- left: -1px;
- }
- }
- &.bottom .arrow {
- top: -$popoverArrowWidth;
- left: 50%;
- margin-left: -$popoverArrowWidth;
- border-width: 0 $popoverArrowWidth $popoverArrowWidth;
- border-bottom-color: $popoverArrowColor;
- &:after {
- border-width: 0 $popoverArrowOuterWidth $popoverArrowOuterWidth;
- border-bottom-color: $popoverArrowOuterColor;
- top: -1px;
- left: -$popoverArrowOuterWidth;
- }
- }
- &.left .arrow {
- top: 50%;
- right: -$popoverArrowWidth;
- margin-top: -$popoverArrowWidth;
- border-width: $popoverArrowWidth 0 $popoverArrowWidth $popoverArrowWidth;
- border-left-color: $popoverArrowColor;
- &:after {
- border-width: $popoverArrowOuterWidth 0 $popoverArrowOuterWidth $popoverArrowOuterWidth;
- border-left-color: $popoverArrowOuterColor;
- bottom: -$popoverArrowOuterWidth;
- right: -1px;
- }
- }
-}
@@ -1,63 +0,0 @@
-/*!
- * Bootstrap v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-// Core variables and mixins
-@import "variables"; // Modify this for custom colors, font-sizes, etc
-@import "mixins";
-
-// CSS Reset
-@import "reset";
-
-// Grid system and page structure
-@import "scaffolding";
-@import "grid";
-@import "layouts";
-
-// Base CSS
-@import "type";
-@import "code";
-@import "forms";
-@import "tables";
-
-// Components: common
-@import "sprites";
-@import "dropdowns";
-@import "wells";
-@import "component-animations";
-@import "close";
-
-// Components: Buttons & Alerts
-@import "buttons";
-@import "button-groups";
-@import "alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons
-
-// Components: Nav
-@import "navs";
-@import "navbar";
-@import "breadcrumbs";
-@import "pagination";
-@import "pager";
-
-// Components: Popovers
-@import "modals";
-@import "tooltip";
-@import "popovers";
-
-// Components: Misc
-@import "thumbnails";
-@import "media";
-@import "labels-badges";
-@import "progress-bars";
-@import "accordion";
-@import "carousel";
-@import "hero-unit";
-
-// Utility classes
-@import "utilities"; // Has to be last to override when necessary
@@ -0,0 +1,54 @@
+# Changelog
+
+# 2.1.1.0
+* Update to Bootstrap 2.1.1
+* [#222] Remove 100% multiplier in vertical-three-colours
+* [#227] Fix IE component animation collapse
+* [#228] Fix variables documentation link
+* [#231] Made .input-block-level a class as well as mixin
+
+# 2.1.0.1
+* [#219] Fix expected a color. Got: transparent.
+* [#207] Add missing warning style for table row highlighting
+* [#208] Use grid-input-span for input spans
+
+## 2.1.0.0
+* Updated to Bootstrap 2.1
+* Changed some mixin names to be more consistent. Nested mixins in Less are separated by a `-` when they are flattened in Sass.
+
+## 2.0.4.1
+* Fix `.row-fluid > spanX` nesting
+* Small Javascript fixes for those staying on the 2.0.4 release
+* Add `!default` to z-index variables.
+
+## 2.0.4.0
+* Updated to Bootstrap 2.0.4
+* Switched to Bootstrap 2.0.3+'s method of separating responsive files
+* [#149, #150] Fix off by one error introduced with manual revert of media query breakpoints
+* `rake debug` and `rake test` both compile bootstrap & bootstrap-responsive
+
+## 2.0.3.1
+* [#145, #146] Fix button alignment in collapsing navbar as a result of an incorrect variable
+
+## 2.0.3
+* Updated to Bootstrap 2.0.3
+* [#106] Support for Rails < 3.1 through Compass
+* [#132] Add CI testing
+* [#106] Support Rails w/Compass
+* [#134] Fix support for Rails w/Compass
+
+## 2.0.2
+* [#86] Updated to Bootstrap 2.0.2
+Things of note: static navbars now have full width. (to be fixed in 2.0.3) `.navbar-inner > .container { width:940px; }` seems to work in the meanwhile
+* [#62] Fixed asset compilation taking a *very* long time.
+* [#69, #79, #80] \(Hopefully) clarified README. Now with less cat humour.
+* [#91] Removed doubled up Sass extensions for Rails.
+* [#63, #73] Allow for overriding of image-path
+* [[SO](http://stackoverflow.com/a/9909626/241212)] Added makeFluidColumn mixin for defining fluid columns. Fluid rows must use `@extend .row-fluid`, and any column inside it can use `@include makeFluidColumn(num)`, where `num` is the number of columns. Unfortunately, there is a rather major limitation to this: margins on first-child elements must be overriden. See the attached Stack Overflow answer for more information.
+
+## 2.0.1
+* Updated to Bootstrap 2.0.1
+* Modified `@mixin opacity()` to take an argument `0...1` rather than `0...100` to be consistent with Compass.
+
+## 2.0.0
+* Updated to Bootstrap 2.0.0
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec
@@ -13,7 +13,7 @@ Enjoy.
In your Gemfile:
gem 'sass-rails', '~> 3.2'
- gem 'bootstrap-sass', '~> 2.2.1.0'
+ gem 'bootstrap-sass', '~> 2.2.2.0'
#### CSS
@@ -94,7 +94,7 @@ Basically this means you should expect to append a separate patch version to the
### Bundler?
- gem 'bootstrap-sass', '~> 2.2.1.0'
+ gem 'bootstrap-sass', '~> 2.2.2.0'
Don't use the standard `~> 2.x.y`. Your apps may break.
@@ -0,0 +1,20 @@
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+ t.libs << "test"
+ t.test_files = FileList['test/*_test.rb']
+ t.verbose = true
+end
+
+desc 'Dumps output to a CSS file for testing'
+task :debug do
+ require 'sass'
+ require './lib/bootstrap-sass/compass_functions'
+ require './lib/bootstrap-sass/rails_functions'
+ path = './vendor/assets/stylesheets'
+ %w(bootstrap bootstrap-responsive).each do |file|
+ engine = Sass::Engine.for_file("#{path}/_#{file}.scss", syntax: :scss, load_paths: [path])
+ File.open("./#{file}.css", 'w') { |f| f.write(engine.render) }
+ end
+end
+
+task default: :test
@@ -0,0 +1,15 @@
+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
@@ -0,0 +1,15 @@
+Gem::Specification.new do |s|
+ s.name = "bootstrap-sass"
+ s.version = '2.2.2.0'
+ s.authors = ["Thomas McDonald"]
+ s.email = 'tom@conceptcoding.co.uk'
+ s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"
+ s.homepage = "http://github.com/thomas-mcdonald/bootstrap-sass"
+ s.license = "Apache 2.0"
+
+ s.add_development_dependency 'compass'
+ s.add_development_dependency 'sass-rails', '~> 3.2'
+ s.add_runtime_dependency 'sass', '~> 3.2'
+
+ s.files = Dir["vendor/**/*.{scss,js,png}"] + Dir["lib/**/*"] + Dir["templates/**/*"] + ["README.md", "LICENSE"]
+end
@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class CompilationTest < Test::Unit::TestCase
+ def test_compilation
+ path = 'vendor/assets/stylesheets'
+ %w(bootstrap bootstrap-responsive).each do |file|
+ engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
+ assert_nothing_raised do
+ engine.render
+ end
+ end
+ end
+end
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'sass', '~> 3.2'
+
+gemspec path: '../../'
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'sass', git: 'git://github.com/nex3/sass.git'
+
+gemspec path: '../../'
@@ -0,0 +1,7 @@
+$:.unshift("#{File.dirname(__FILE__)}/..")
+
+require 'test/unit'
+
+require 'sass'
+require 'lib/bootstrap-sass/compass_functions'
+require 'lib/bootstrap-sass/rails_functions'
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+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
+# 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 img/ to images/
+cp -r $TMP/img/* $ROOT/images
+# Remove tests
+rm -r $ROOT/javascripts/tests
+rm -r $ROOT/stylesheets/bootstrap/tests
+
+# Patch the asset-url in _variables.scss
+patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch
+
+# Patch paths in bootstrap.scss and responsive.scss
+sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss
+rm $ROOT/stylesheets/bootstrap/*.bak
+
+rm -rf $TMP
Oops, something went wrong.

0 comments on commit 9d55f4a

Please sign in to comment.