Permalink
Browse files

Merge branch 'release/3.1.0.0'

* release/3.1.0.0:
  Bump license date
  Show a prominent deprecation notice
  Convert to a shim for official bootstrap-sass gem
  Test against Rails 4.1.0.beta1
  • Loading branch information...
mjonuschat committed Jan 31, 2014
2 parents c649c78 + 3b70315 commit 0dea465a4a8e0ff716fbaa25c524962be9b80ef1
Showing with 110 additions and 9,413 deletions.
  1. +1 −0 .travis.yml
  2. +8 −7 Appraisals
  3. +1 −1 LICENSE
  4. +24 −133 README.md
  5. BIN app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot
  6. +0 −229 app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg
  7. BIN app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf
  8. BIN app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff
  9. +1 −12 app/assets/javascripts/twitter/bootstrap.js
  10. +1 −126 app/assets/javascripts/twitter/bootstrap/affix.js
  11. +1 −98 app/assets/javascripts/twitter/bootstrap/alert.js
  12. +1 −115 app/assets/javascripts/twitter/bootstrap/button.js
  13. +1 −217 app/assets/javascripts/twitter/bootstrap/carousel.js
  14. +1 −179 app/assets/javascripts/twitter/bootstrap/collapse.js
  15. +1 −154 app/assets/javascripts/twitter/bootstrap/dropdown.js
  16. +1 −246 app/assets/javascripts/twitter/bootstrap/modal.js
  17. +1 −117 app/assets/javascripts/twitter/bootstrap/popover.js
  18. +1 −158 app/assets/javascripts/twitter/bootstrap/scrollspy.js
  19. +1 −135 app/assets/javascripts/twitter/bootstrap/tab.js
  20. +1 −386 app/assets/javascripts/twitter/bootstrap/tooltip.js
  21. +1 −56 app/assets/javascripts/twitter/bootstrap/transition.js
  22. +1 −49 app/assets/stylesheets/twitter/bootstrap.css.scss
  23. +1 −67 app/assets/stylesheets/twitter/bootstrap/_alerts.scss
  24. +1 −51 app/assets/stylesheets/twitter/bootstrap/_badges.scss
  25. +1 −23 app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss
  26. +1 −227 app/assets/stylesheets/twitter/bootstrap/_button-groups.scss
  27. +1 −155 app/assets/stylesheets/twitter/bootstrap/_buttons.scss
  28. +1 −232 app/assets/stylesheets/twitter/bootstrap/_carousel.scss
  29. +1 −34 app/assets/stylesheets/twitter/bootstrap/_close.scss
  30. +1 −53 app/assets/stylesheets/twitter/bootstrap/_code.scss
  31. +1 −29 app/assets/stylesheets/twitter/bootstrap/_component-animations.scss
  32. +1 −187 app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss
  33. +1 −373 app/assets/stylesheets/twitter/bootstrap/_forms.scss
  34. +1 −237 app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss
  35. +1 −78 app/assets/stylesheets/twitter/bootstrap/_grid.scss
  36. +1 −136 app/assets/stylesheets/twitter/bootstrap/_input-groups.scss
  37. +1 −46 app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss
  38. +1 −64 app/assets/stylesheets/twitter/bootstrap/_labels.scss
  39. +1 −88 app/assets/stylesheets/twitter/bootstrap/_list-group.scss
  40. +1 −56 app/assets/stylesheets/twitter/bootstrap/_media.scss
  41. +1 −847 app/assets/stylesheets/twitter/bootstrap/_mixins.scss
  42. +1 −129 app/assets/stylesheets/twitter/bootstrap/_modals.scss
  43. +1 −616 app/assets/stylesheets/twitter/bootstrap/_navbar.scss
  44. +1 −242 app/assets/stylesheets/twitter/bootstrap/_navs.scss
  45. +1 −406 app/assets/stylesheets/twitter/bootstrap/_normalize.scss
  46. +1 −55 app/assets/stylesheets/twitter/bootstrap/_pager.scss
  47. +1 −85 app/assets/stylesheets/twitter/bootstrap/_pagination.scss
  48. +1 −182 app/assets/stylesheets/twitter/bootstrap/_panels.scss
  49. +1 −133 app/assets/stylesheets/twitter/bootstrap/_popovers.scss
  50. +1 −105 app/assets/stylesheets/twitter/bootstrap/_print.scss
  51. +1 −80 app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss
  52. +1 −198 app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss
  53. +1 −119 app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss
  54. +1 −231 app/assets/stylesheets/twitter/bootstrap/_tables.scss
  55. +1 −247 app/assets/stylesheets/twitter/bootstrap/_theme.scss
  56. +1 −38 app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss
  57. +1 −95 app/assets/stylesheets/twitter/bootstrap/_tooltip.scss
  58. +1 −281 app/assets/stylesheets/twitter/bootstrap/_type.scss
  59. +1 −56 app/assets/stylesheets/twitter/bootstrap/_utilities.scss
  60. +1 −642 app/assets/stylesheets/twitter/bootstrap/_variables.scss
  61. +1 −29 app/assets/stylesheets/twitter/bootstrap/_wells.scss
  62. +7 −4 bootstrap-sass-rails.gemspec
  63. +0 −7 gemfiles/3.1.gemfile
  64. +0 −1 gemfiles/4.0.gemfile
  65. +9 −0 gemfiles/4.1.gemfile
  66. +1 −1 lib/bootstrap-sass-rails.rb
  67. +0 −5 lib/bootstrap/sass/extensions.rb
  68. +0 −15 lib/bootstrap/sass/extensions/functions.rb
  69. +3 −8 lib/bootstrap/sass/rails/engine.rb
  70. +2 −1 lib/bootstrap/sass/rails/version.rb
  71. +1 −1 lib/generators/bootstrap/templates/USAGE
View
@@ -8,6 +8,7 @@ gemfile:
- gemfiles/3.1.gemfile
- gemfiles/3.2.gemfile
- gemfiles/4.0.gemfile
+ - gemfiles/4.1.gemfile
branches:
only:
View
@@ -1,12 +1,13 @@
-appraise "3.1" do
- gem "rails", "~> 3.1.0"
-end
-
appraise "3.2" do
- gem "rails", "~> 3.2.0"
+ gem "rails", "~> 3.2.0"
end
appraise "4.0" do
- gem "rails", "~> 4.0.0"
- gem "sass-rails", "~> 4.0.0"
+ gem "rails", "~> 4.0.0"
+end
+
+appraise "4.1" do
+ gem "rails", "~> 4.1.0.beta1"
+ gem "sqlite3", platform: :ruby
+ gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
end
View
@@ -1,4 +1,4 @@
-Copyright 2011-2013 Morton Jonuschat
+Copyright 2011-2014 Morton Jonuschat
Twitter Bootstrap Copyright 2011-2013 Twitter, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
View
157 README.md
@@ -1,143 +1,34 @@
-# Bootstrap::Sass::Rails
+# DEPRECATION NOTICE
-Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more.
-It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
+The bootstrap-sass-rails is deprecated starting with version 3.1.0.0.
+There is an official Sass port of Bootstrap now which can be found
+within the twbs organization on GitHub:
-Twitter Bootstrap has been converted to Sass which makes it possible to use the default Rails Asset Pipeline
+https://github.com/twbs/bootstrap-sass
-* All assets have been namespaced within twitter/bootstrap to avoid naming conflicts
-* Top level requires for sprockets to get the complete bundle with a
- simple = require twitter/bootstrap
-* Ability to import individually namespaced stylesheets or javascripts.
+You are recommended to upgrade your Gemfile to directly use bootstrap-sass
+from now on. Upgrading should be really simple, the differences between the
+gems are mostly in the namespacing.
-## Installation
+UPGRADING
-Add these lines to your application's Gemfile:
+ Remove the twitter/ prefix from all your `@import` and `= require`
+ statements:
- gem 'bootstrap-sass-rails'
+ Before:
+ @import "twitter/bootstrap";
+ @import "twitter/bootstrap/modal";
-And then execute:
+ After:
+ @import "bootstrap";
+ @import "bootstrap/modal";
- $ bundle install
+ Before:
+ //= require "twitter/bootstrap";
+ //= require "twitter/bootstrap/modal";
-Or install it yourself as:
+ After:
+ //= require "bootstrap";
+ //= require "bootstrap/modal";
- $ gem install bootstrap-sass-rails
-
-## Usage
-
-### Stylesheets
-
-The easiest way to use Twitter Bootstrap is to require it in your `application.css` file.
-
-```css
-/*
- *= require twitter/bootstrap
- */
-
-#example {
- /* Your styles... */
-}
-```
-
-If you need access to the variables within the Twitter Bootstrap framework or want to use the mixins you
-will need to import it within an `.css.scss` file. This will still include the complete framework.
-
-```css
-@import "twitter/bootstrap";
-
-#foo {
- @include border-radius(4px);
-}
-```
-
-Using only parts of the framework like variables and mixin you can import all of these individually from
-within `.css.scss` files.
-
-```css
-@import "twitter/bootstrap/variables";
-@import "twitter/bootstrap/mixins";
-
-@mixin myButton($radius: 5px) {
- @include border-radius($radius);
-}
-
-#foo {
- @include myButton(10px);
-}
-```
-
-You can also use the generator to generate custom bootstrap includes to override your variables and load only
-the components you need.
-
-```
-rails generate bootstrap:customize
-```
-
-Then you just need to include the bootstrap-custom file in your application.css
-
-```css
-@import "bootstrap-custom";
-```
-
-The generator has a `--css-components` option that includes all available bootstrap components in the
-custom include file. You can pick and choose what you need from there. There can be dependencies between
-the different components, please check the Bootstrap homepage for details.
-
-For the Javascript components there is a `--js-components` option. The same rules as for the CSS components
-apply, if you are unsure about the order and dependencies please check the upstream homepage.
-
-### Javascripts
-
-Using the JavaScript works the same way. You can include them all with a
-single require directive from your `application.js`.
-
-```javascript
-//= require twitter/bootstrap
-
-$(document).ready(function(){
-});
-```
-
-If you only want a part of the javascripts require the individual files
-from your `.js` file.
-
-```javascript
-//= require twitter/bootstrap/modal
-
-$(document).ready(function(){
-});
-```
-
-## Versioning
-
-This gem will directly track the semantic versioning releases of the Twitter Bootstrap project.
-If it should be necessary a build number will be added to the version to
-mark releases specific to this gem.
-
-## Note on Patches / Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
- (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-## Credits
-
-This work incorporates [Twitter Bootstrap](https://github.com/twitter/bootstrap) by Twitter, Inc.
-This gem has been inspired by [less-rails-bootstrap](https://github.com/metaskills/less-rails-bootstrap) by Ken Collins
-
-## Maintainers
-
-* [Morton Jonuschat](https://github.com/yabawock)
-
-## License
-
-Apache License, Version 2.0
-
-## Copyright
-
-Copyright 2011-2013 Morton Jonuschat
-Twitter Bootstrap copyright 2011-2013 Twitter, Inc
+ Thank you for using bootstrap-sass-rails!
Oops, something went wrong.

0 comments on commit 0dea465

Please sign in to comment.