RubyGems - bootstrap-sass-rails - Versions diffs - 3.0.3.0 → 3.1.0.0 - Mend

bootstrap-sass-rails 3.0.3.0 → 3.1.0.0

Files changed (66) hide show

data/LICENSE CHANGED

@@ -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");

data/README.md CHANGED

@@ -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!

data/app/assets/javascripts/twitter/bootstrap.js CHANGED

@@ -1,12 +1 @@
-//= require twitter/bootstrap/transition
-//= require twitter/bootstrap/alert
-//= require twitter/bootstrap/button
-//= require twitter/bootstrap/carousel
-//= require twitter/bootstrap/collapse
-//= require twitter/bootstrap/dropdown
-//= require twitter/bootstrap/modal
-//= require twitter/bootstrap/tooltip
-//= require twitter/bootstrap/popover
-//= require twitter/bootstrap/scrollspy
-//= require twitter/bootstrap/tab
-//= require twitter/bootstrap/affix
+//= require bootstrap

data/app/assets/javascripts/twitter/bootstrap/affix.js CHANGED

@@ -1,126 +1 @@
-/* ========================================================================
- * Bootstrap: affix.js v3.0.3
- * http://getbootstrap.com/javascript/#affix
- * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-+function ($) { "use strict";
-  // AFFIX CLASS DEFINITION
-  // ======================
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-    this.$window = $(window)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
-    this.$element = $(element)
-    this.affixed  =
-    this.unpin    = null
-    this.checkPosition()
-  }
-  Affix.RESET = 'affix affix-top affix-bottom'
-  Affix.DEFAULTS = {
-    offset: 0
-  }
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-    var scrollHeight = $(document).height()
-    var scrollTop    = this.$window.scrollTop()
-    var position     = this.$element.offset()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
-                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
-                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
-    if (this.affixed === affix) return
-    if (this.unpin) this.$element.css('top', '')
-    this.affixed = affix
-    this.unpin   = affix == 'bottom' ? position.top - scrollTop : null
-    this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
-    if (affix == 'bottom') {
-      this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
-    }
-  }
-  // AFFIX PLUGIN DEFINITION
-  // =======================
-  var old = $.fn.affix
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-  $.fn.affix.Constructor = Affix
-  // AFFIX NO CONFLICT
-  // =================
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-  // AFFIX DATA-API
-  // ==============
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
-      data.offset = data.offset || {}
-      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop)    data.offset.top    = data.offsetTop
-      $spy.affix(data)
-    })
-  })
-}(jQuery);
+//= require bootstrap/affix

data/app/assets/javascripts/twitter/bootstrap/alert.js CHANGED

@@ -1,98 +1 @@
-/* ========================================================================
- * Bootstrap: alert.js v3.0.3
- * http://getbootstrap.com/javascript/#alerts
- * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-+function ($) { "use strict";
-  // ALERT CLASS DEFINITION
-  // ======================
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-    var $parent = $(selector)
-    if (e) e.preventDefault()
-    if (!$parent.length) {
-      $parent = $this.hasClass('alert') ? $this : $this.parent()
-    }
-    $parent.trigger(e = $.Event('close.bs.alert'))
-    if (e.isDefaultPrevented()) return
-    $parent.removeClass('in')
-    function removeElement() {
-      $parent.trigger('closed.bs.alert').remove()
-    }
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one($.support.transition.end, removeElement)
-        .emulateTransitionEnd(150) :
-      removeElement()
-  }
-  // ALERT PLUGIN DEFINITION
-  // =======================
-  var old = $.fn.alert
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-  $.fn.alert.Constructor = Alert
-  // ALERT NO CONFLICT
-  // =================
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-  // ALERT DATA-API
-  // ==============
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-}(jQuery);
+//= require bootstrap/alert

data/app/assets/javascripts/twitter/bootstrap/button.js CHANGED

@@ -1,115 +1 @@
-/* ========================================================================
- * Bootstrap: button.js v3.0.3
- * http://getbootstrap.com/javascript/#buttons
- * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-+function ($) { "use strict";
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
-  var Button = function (element, options) {
-    this.$element = $(element)
-    this.options  = $.extend({}, Button.DEFAULTS, options)
-  }
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-    state = state + 'Text'
-    if (!data.resetText) $el.data('resetText', $el[val]())
-    $el[val](data[state] || this.options[state])
-    // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d);
-    }, 0)
-  }
-  Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-    var changed = true
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') === 'radio') {
-        // see if clicking on current one
-        if ($input.prop('checked') && this.$element.hasClass('active'))
-          changed = false
-        else
-          $parent.find('.active').removeClass('active')
-      }
-      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
-    }
-    if (changed) this.$element.toggleClass('active')
-  }
-  // BUTTON PLUGIN DEFINITION
-  // ========================
-  var old = $.fn.button
-  $.fn.button = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-  $.fn.button.Constructor = Button
-  // BUTTON NO CONFLICT
-  // ==================
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-  // BUTTON DATA-API
-  // ===============
-  $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
-    e.preventDefault()
-  })
-}(jQuery);
+//= require bootstrap/button