[DRE-commits] [ruby-bootstrap-sass] 05/06: Merge tag 'upstream/3.3.5.1'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-bootstrap-sass.

commit 0ee3277eb672c6aa5bef9e353769353899faf2fa
Merge: 86e839f db7f6a4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Aug 9 12:50:13 2015 -0300

    Merge tag 'upstream/3.3.5.1'
    
    Upstream version 3.3.5.1
    
    # gpg: Signature made Dom 09 Ago 2015 12:50:11 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .travis.yml                                        |   1 -
 CHANGELOG.md                                       |   6 +
 README.md                                          |   7 +-
 assets/javascripts/bootstrap-sprockets.js          |   4 +-
 assets/javascripts/bootstrap.js                    | 240 ++++++++++++---------
 assets/javascripts/bootstrap.min.js                |   8 +-
 assets/javascripts/bootstrap/affix.js              |   6 +-
 assets/javascripts/bootstrap/alert.js              |   4 +-
 assets/javascripts/bootstrap/button.js             |  22 +-
 assets/javascripts/bootstrap/carousel.js           |   4 +-
 assets/javascripts/bootstrap/collapse.js           |   4 +-
 assets/javascripts/bootstrap/dropdown.js           |  88 ++++----
 assets/javascripts/bootstrap/modal.js              |  12 +-
 assets/javascripts/bootstrap/popover.js            |   4 +-
 assets/javascripts/bootstrap/scrollspy.js          |   4 +-
 assets/javascripts/bootstrap/tab.js                |   8 +-
 assets/javascripts/bootstrap/tooltip.js            |  78 +++++--
 assets/javascripts/bootstrap/transition.js         |   2 +-
 assets/stylesheets/_bootstrap.scss                 |   6 +
 assets/stylesheets/bootstrap/_badges.scss          |   2 +-
 assets/stylesheets/bootstrap/_button-groups.scss   |   5 +-
 assets/stylesheets/bootstrap/_buttons.scss         |  18 +-
 assets/stylesheets/bootstrap/_carousel.scss        |   4 +-
 assets/stylesheets/bootstrap/_dropdowns.scss       |   4 +-
 assets/stylesheets/bootstrap/_forms.scss           |  59 +++--
 assets/stylesheets/bootstrap/_glyphicons.scss      |  20 +-
 assets/stylesheets/bootstrap/_input-groups.scss    |   1 +
 assets/stylesheets/bootstrap/_jumbotron.scss       |   8 +-
 assets/stylesheets/bootstrap/_list-group.scss      |  12 +-
 assets/stylesheets/bootstrap/_media.scss           |   5 +
 assets/stylesheets/bootstrap/_mixins.scss          |   1 +
 assets/stylesheets/bootstrap/_normalize.scss       |  19 +-
 assets/stylesheets/bootstrap/_pagination.scss      |   5 +-
 assets/stylesheets/bootstrap/_panels.scss          |   6 +
 assets/stylesheets/bootstrap/_popovers.scss        |  12 +-
 assets/stylesheets/bootstrap/_print.scss           |   6 -
 .../bootstrap/_responsive-utilities.scss           |   6 +-
 assets/stylesheets/bootstrap/_scaffolding.scss     |   3 +-
 assets/stylesheets/bootstrap/_theme.scss           |  28 ++-
 assets/stylesheets/bootstrap/_tooltip.scss         |   9 +-
 assets/stylesheets/bootstrap/_variables.scss       |   8 +-
 .../bootstrap/mixins/_background-variant.scss      |   3 +-
 assets/stylesheets/bootstrap/mixins/_buttons.scss  |  20 +-
 .../bootstrap/mixins/_grid-framework.scss          |   4 +-
 assets/stylesheets/bootstrap/mixins/_grid.scss     |   4 +-
 .../stylesheets/bootstrap/mixins/_hide-text.scss   |   2 +-
 .../stylesheets/bootstrap/mixins/_list-group.scss  |   5 +-
 .../stylesheets/bootstrap/mixins/_pagination.scss  |   3 +-
 .../stylesheets/bootstrap/mixins/_reset-text.scss  |  18 ++
 .../bootstrap/mixins/_responsive-visibility.scss   |   2 +-
 .../bootstrap/mixins/_text-emphasis.scss           |   3 +-
 bootstrap-sass.gemspec                             |   2 +-
 bower.json                                         |   7 +-
 lib/bootstrap-sass.rb                              |   2 +-
 lib/bootstrap-sass/version.rb                      |   4 +-
 metadata.yml                                       |  11 +-
 package.json                                       |   2 +-
 tasks/converter/less_conversion.rb                 |  11 +-
 templates/project/_bootstrap-variables.sass        |  10 +-
 test/dummy_sass_only/Gemfile                       |   2 +-
 test/gemfiles/sass_3_2.gemfile                     |   6 -
 61 files changed, 546 insertions(+), 324 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-bootstrap-sass.git