bootstrap-sass-rails 3.0.0.3 → 3.1.0.0

data/app/assets/stylesheets/twitter/bootstrap.css.scss

@@ -1,59 +1 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 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 by @mdo and @fat.
- */
-
-// Core variables and mixins
-@import "twitter/bootstrap/variables";
-@import "twitter/bootstrap/mixins";
-
-// Reset
-@import "twitter/bootstrap/normalize";
-@import "twitter/bootstrap/print";
-
-// Core CSS
-@import "twitter/bootstrap/scaffolding";
-@import "twitter/bootstrap/type";
-@import "twitter/bootstrap/code";
-@import "twitter/bootstrap/grid";
-@import "twitter/bootstrap/tables";
-@import "twitter/bootstrap/forms";
-@import "twitter/bootstrap/buttons";
-
-// Components
-@import "twitter/bootstrap/component-animations";
-@import "twitter/bootstrap/glyphicons";
-@import "twitter/bootstrap/dropdowns";
-@import "twitter/bootstrap/button-groups";
-@import "twitter/bootstrap/input-groups";
-@import "twitter/bootstrap/navs";
-@import "twitter/bootstrap/navbar";
-@import "twitter/bootstrap/breadcrumbs";
-@import "twitter/bootstrap/pagination";
-@import "twitter/bootstrap/pager";
-@import "twitter/bootstrap/labels";
-@import "twitter/bootstrap/badges";
-@import "twitter/bootstrap/jumbotron";
-@import "twitter/bootstrap/thumbnails";
-@import "twitter/bootstrap/alerts";
-@import "twitter/bootstrap/progress-bars";
-@import "twitter/bootstrap/media";
-@import "twitter/bootstrap/list-group";
-@import "twitter/bootstrap/panels";
-@import "twitter/bootstrap/wells";
-@import "twitter/bootstrap/close";
-
-// Components w/ JavaScript
-@import "twitter/bootstrap/modals";
-@import "twitter/bootstrap/tooltip";
-@import "twitter/bootstrap/popovers";
-@import "twitter/bootstrap/carousel";
-
-// Utility classes
-@import "twitter/bootstrap/utilities";
-@import "twitter/bootstrap/responsive-utilities";
+@import "bootstrap/bootstrap";

data/lib/bootstrap/sass/rails/engine.rb

@@ -2,7 +2,10 @@ module Bootstrap
   module Sass
     module Rails
       class Engine < ::Rails::Engine
-        # Make rails look at the vendored assets
+        initializer :after_append_asset_paths, :group => :all, :after => :append_assets_path do |app|
+          ::Bootstrap.load!
+          app.config.assets.paths.unshift File.join(::Bootstrap.stylesheets_path, 'bootstrap')
+        end
       end
     end
   end

data/lib/bootstrap/sass/rails/version.rb

@@ -1,7 +1,8 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '3.0.0.3'
+      VERSION = '3.1.0'
+      PATCHLEVEL = '0'
     end
   end
 end

data/lib/bootstrap-sass-rails.rb

@@ -5,5 +5,5 @@ module Bootstrap
   end
 end
 
+require 'bootstrap-sass'
 require 'bootstrap/sass/rails'
-require 'bootstrap/sass/extensions'

data/lib/generators/bootstrap/customize_generator.rb

@@ -0,0 +1,37 @@
+require 'rails/generators'
+
+module Bootstrap
+  class CustomizeGenerator < Rails::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)
+
+    class_option :customize_variables, type: :boolean, default: true, desc: 'Customize variables to define colors, sizes and more inside your custom stylesheets'
+    class_option :css_components, type: :boolean, default: false, desc: 'Choose which SCSS files to compile into your custom build of Bootstrap'
+    class_option :js_components, type: :boolean, default: false, desc: 'Choose which JS files to compile into your custom build of Bootstrap'
+
+    # Copy all needed stylesheets in the asset directory of the application
+    def customize_default_variables
+      template "bootstrap-custom.css.scss", "app/assets/stylesheets/bootstrap-custom.css.scss"
+    end
+
+    def customize_css_components
+      if options.css_components?
+        append_file "app/assets/stylesheets/bootstrap-custom.css.scss" do
+          File.read File.expand_path("../../../../app/assets/stylesheets/twitter/bootstrap.css.scss", __FILE__)
+        end
+      end
+    end
+
+    def customize_js_components
+      if options.js_components?
+        template "bootstrap-custom.js", "app/assets/javascripts/bootstrap-custom.js"
+        append_file "app/assets/javascripts/bootstrap-custom.js" do
+          File.read File.expand_path("../../../../app/assets/javascripts/twitter/bootstrap.js", __FILE__)
+        end
+      end
+    end
+
+    def show_usage
+      readme "USAGE" if behavior == :invoke
+    end
+  end
+end

data/lib/generators/bootstrap/templates/USAGE

@@ -0,0 +1,23 @@
+===============================================================================
+
+Some setup you must do manually:
+
+  1. Include the bootstrap-custom stylesheet in your application.css.scss before
+     you import the twitter/bootstrap file:
+
+     @import "bootstrap-custom";
+
+  2. If you chose to customize the CSS components remove the following line
+     from your application.css.scss, the bootstrap components will be imported
+     from the bootstrap-custom.css.scss file:
+
+     @import "bootstrap";
+
+  3. If you chose to customize the JS components add the necessary require
+     directive to your application.js file:
+
+     //= require bootstrap-custom
+
+  Thank you for using bootstrap-sass-rails!
+
+===============================================================================

data/lib/generators/bootstrap/templates/bootstrap-custom.css.scss

@@ -0,0 +1,18 @@
+//
+// Bootstrap Customization
+//
+// For all available variables hava a look at the
+// Bootstrap Customizer provided by the authors:
+//
+// http://getbootstrap.com/customize/#less-variables
+//
+// Or you can look into the SCSS variables to see
+// the Sass equivalents:
+//
+// https://github.com/yabawock/bootstrap-sass-rails/blob/master/app/assets/stylesheets/twitter/bootstrap/_variables.scss
+
+// Customization
+// -------------------------
+$body-bg:               #fff;
+$text-color:            lighten(#000, 20%);
+

data/lib/generators/bootstrap/templates/bootstrap-custom.js

@@ -0,0 +1,3 @@
+//
+// Bootstrap Customization
+//

data/test/cases/less_to_sass_spec.rb

@@ -7,7 +7,7 @@ class LessToSassSpec < Bootstrap::Sass::Rails::Spec
     let(:app_css) { dummy_asset('application.css').gsub(/\n+\s+/, ' ') }
 
     it 'should include the clearfix helper classes' do
-      app_css.must_include '.clearfix:before, .clearfix:after { content: " "; /* 1 */ display: table; /* 2 */ }'
+      app_css.must_include '.clearfix:before, .clearfix:after { content: " "; display: table; }'
       app_css.must_include '.clearfix:after { clear: both; }'
     end
 

data/test/cases/usage_css_spec.rb

@@ -7,8 +7,6 @@ class UsageCssSpec < Bootstrap::Sass::Rails::Spec
     let(:app_css) { dummy_asset('application.css').gsub(/\n+\s+/, ' ') }
 
     it 'will render main bootstrap.less file and all included modules' do
-      app_css.must_include 'Bootstrap v'
-
       app_css.must_include '.alert {'
       app_css.must_include '.badge {'
       app_css.must_include '.breadcrumb {'
@@ -75,7 +73,6 @@ class UsageCssSpec < Bootstrap::Sass::Rails::Spec
     let(:sprockets_css) { dummy_asset('sprockets.css').gsub(/\n+\s+/, ' ') }
 
     it 'will render main bootstrap.css file and all included modules' do
-      sprockets_css.must_include 'Bootstrap v'
       sprockets_css.must_include '.alert {'
       sprockets_css.must_include '.badge {'
       sprockets_css.must_include '.breadcrumb {'

metadata

@@ -1,46 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0.3
+  version: 3.1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Morton Jonuschat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,20 +78,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -89,10 +116,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot
-- app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg
-- app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf
-- app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff
 - app/assets/javascripts/twitter/bootstrap/affix.js
 - app/assets/javascripts/twitter/bootstrap/alert.js
 - app/assets/javascripts/twitter/bootstrap/button.js
@@ -146,12 +169,14 @@ files:
 - app/assets/stylesheets/twitter/bootstrap/_variables.scss
 - app/assets/stylesheets/twitter/bootstrap/_wells.scss
 - app/assets/stylesheets/twitter/bootstrap.css.scss
-- lib/bootstrap/sass/extensions/functions.rb
-- lib/bootstrap/sass/extensions.rb
 - lib/bootstrap/sass/rails/engine.rb
 - lib/bootstrap/sass/rails/version.rb
 - lib/bootstrap/sass/rails.rb
 - lib/bootstrap-sass-rails.rb
+- lib/generators/bootstrap/customize_generator.rb
+- lib/generators/bootstrap/templates/bootstrap-custom.css.scss
+- lib/generators/bootstrap/templates/bootstrap-custom.js
+- lib/generators/bootstrap/templates/USAGE
 - LICENSE
 - Rakefile
 - README.md
@@ -193,26 +218,43 @@ files:
 - test/support/helpers.rb
 homepage: https://github.com/yabawock/bootstrap-sass-rails
 licenses: []
-metadata: {}
-post_install_message: 
+post_install_message: ! "# DEPRECATION NOTICE\n\nThe bootstrap-sass-rails is deprecated
+  starting with version 3.1.0.0.\nThere is an official Sass port of Bootstrap now
+  which can be found\nwithin the twbs organization on GitHub:\n\nhttps://github.com/twbs/bootstrap-sass\n\nYou
+  are recommended to upgrade your Gemfile to directly use bootstrap-sass\nfrom now
+  on. Upgrading should be really simple, the differences between the\ngems are mostly
+  in the namespacing.\n\nUPGRADING\n\n  Remove the twitter/ prefix from all your `@import`
+  and `= require`\n  statements:\n\n  Before:\n    @import \"twitter/bootstrap\";\n
+  \   @import \"twitter/bootstrap/modal\";\n\n  After:\n    @import \"bootstrap\";\n
+  \   @import \"bootstrap/modal\";\n\n  Before:\n    //= require \"twitter/bootstrap\";\n
+  \   //= require \"twitter/bootstrap/modal\";\n\n  After:\n    //= require \"bootstrap\";\n
+  \   //= require \"bootstrap/modal\";\n\n  Thank you for using bootstrap-sass-rails!\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1563281602919206843
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1563281602919206843
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: HTML, CSS, and JS toolkit from Twitter converted to Sasss and the Rails asset
   pipeline
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTdiN2RkMjQ1OWYyNjViMWZmZmFlYWI5ZGU1YTcxNGU0M2YyZjJhNg==
-  data.tar.gz: !binary |-
-    ODliNjFmZjdhOTdlYTcxYzUzYTExZjM0NGQ4Y2RkYWU1M2Y3MmRmNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGNhYjRjMjY2ODc1MzYyNjVkMzM1NzRiYzIzMGMxZjE0Mzc2Y2U2NmM5ZGU1
-    MWY2OTYwNmYyNTQ2YmNmYTdlYzhmYzkyMWM0YzY4MjJiNDZmYjdkNTlmZTQ2
-    ZmYyZmQzYTViNDU0NzI5NDBkYTJhODQ3MWZiNTEzZDVjZGU0OTE=
-  data.tar.gz: !binary |-
-    Yzk5Yzk4ZjRiZjUyN2Q5MmM1YTQ4N2Y0M2ZhOTEwMDRmN2IyNDQ5OTg4MDky
-    ZTQ4MGNhYzVmYjhhYjZlZWI1ODVhN2M0N2YyZWY0MDhmZTgzMGM0NGM3NzBh
-    MTIzZTQ5NThlMjliODY2ODcyZGRkZjRkZjdjZDY1OGZiMWE3MTY=