[DRE-commits] [ruby-bootstrap-sass] 02/07: Merge tag 'upstream/3.3.4.1'

Antonio Terceiro terceiro at moszumanska.debian.org
Thu Mar 26 15:02:44 UTC 2015


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 820624fac9742cb27ca7526720cde932c3af67f5
Merge: 4decc33 9d8fb0b
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Mar 26 11:46:15 2015 -0300

    Merge tag 'upstream/3.3.4.1'
    
    Upstream version 3.3.4.1
    
    # gpg: Signature made Qui 26 Mar 2015 11:46:13 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>"

 .gitignore                                         |    6 +-
 .travis.yml                                        |   19 +-
 CHANGELOG.md                                       |   64 +
 CONTRIBUTING.md                                    |   11 +-
 Gemfile                                            |   13 +-
 README.md                                          |  284 ++-
 Rakefile                                           |   36 +-
 .../bootstrap/glyphicons-halflings-regular.eot     |  Bin 0 -> 20127 bytes
 .../bootstrap/glyphicons-halflings-regular.svg     |  288 +++
 .../bootstrap/glyphicons-halflings-regular.ttf     |  Bin 0 -> 45404 bytes
 .../bootstrap/glyphicons-halflings-regular.woff    |  Bin 0 -> 23424 bytes
 .../bootstrap/glyphicons-halflings-regular.woff2   |  Bin 0 -> 18028 bytes
 {test/dummy/app/assets => assets}/images/.keep     |    0
 assets/javascripts/bootstrap-sprockets.js          |   12 +
 assets/javascripts/bootstrap.js                    | 2317 ++++++++++++++++++++
 assets/javascripts/bootstrap.min.js                |    7 +
 .../javascripts/bootstrap/affix.js                 |   95 +-
 .../javascripts/bootstrap/alert.js                 |   24 +-
 .../javascripts/bootstrap/button.js                |   37 +-
 .../javascripts/bootstrap/carousel.js              |  126 +-
 .../javascripts/bootstrap/collapse.js              |  127 +-
 .../javascripts/bootstrap/dropdown.js              |   56 +-
 .../javascripts/bootstrap/modal.js                 |  174 +-
 .../javascripts/bootstrap/popover.js               |   26 +-
 .../javascripts/bootstrap/scrollspy.js             |   95 +-
 .../assets => assets}/javascripts/bootstrap/tab.js |   76 +-
 .../javascripts/bootstrap/tooltip.js               |  245 ++-
 .../javascripts/bootstrap/transition.js            |   27 +-
 assets/stylesheets/_bootstrap-compass.scss         |    9 +
 assets/stylesheets/_bootstrap-mincer.scss          |   19 +
 assets/stylesheets/_bootstrap-sprockets.scss       |    9 +
 .../stylesheets/_bootstrap.scss                    |    5 +-
 .../stylesheets/bootstrap/_alerts.scss             |   12 +-
 .../stylesheets/bootstrap/_badges.scss             |   37 +-
 .../stylesheets/bootstrap/_breadcrumbs.scss        |    0
 .../stylesheets/bootstrap/_button-groups.scss      |   41 +-
 .../stylesheets/bootstrap/_buttons.scss            |   17 +-
 .../stylesheets/bootstrap/_carousel.scss           |   47 +-
 .../stylesheets/bootstrap/_close.scss              |    1 +
 .../stylesheets/bootstrap/_code.scss               |    8 +-
 .../bootstrap/_component-animations.scss           |   37 +
 .../stylesheets/bootstrap/_dropdowns.scss          |   17 +-
 .../stylesheets/bootstrap/_forms.scss              |  268 ++-
 .../stylesheets/bootstrap/_glyphicons.scss         |   74 +-
 .../stylesheets/bootstrap/_grid.scss               |    8 +-
 .../stylesheets/bootstrap/_input-groups.scss       |    8 +-
 .../stylesheets/bootstrap/_jumbotron.scss          |   16 +-
 .../stylesheets/bootstrap/_labels.scss             |   20 +-
 .../stylesheets/bootstrap/_list-group.scss         |   32 +-
 assets/stylesheets/bootstrap/_media.scss           |   61 +
 assets/stylesheets/bootstrap/_mixins.scss          |   39 +
 .../stylesheets/bootstrap/_modals.scss             |   25 +-
 .../stylesheets/bootstrap/_navbar.scss             |  108 +-
 .../stylesheets/bootstrap/_navs.scss               |    8 +-
 .../stylesheets/bootstrap/_normalize.scss          |   44 +-
 .../stylesheets/bootstrap/_pager.scss              |    5 +-
 .../stylesheets/bootstrap/_pagination.scss         |    2 +-
 .../stylesheets/bootstrap/_panels.scss             |   44 +-
 .../stylesheets/bootstrap/_popovers.scss           |   12 +-
 assets/stylesheets/bootstrap/_print.scss           |  107 +
 .../stylesheets/bootstrap/_progress-bars.scss      |   19 +-
 .../stylesheets/bootstrap/_responsive-embed.scss   |   35 +
 .../bootstrap/_responsive-utilities.scss           |  177 ++
 .../stylesheets/bootstrap/_scaffolding.scss        |   36 +-
 .../stylesheets/bootstrap/_tables.scss             |   33 +-
 .../stylesheets/bootstrap/_theme.scss              |   50 +-
 .../stylesheets/bootstrap/_thumbnails.scss         |    4 +-
 .../stylesheets/bootstrap/_tooltip.scss            |   17 +-
 .../stylesheets/bootstrap/_type.scss               |   62 +-
 .../stylesheets/bootstrap/_utilities.scss          |    7 +-
 .../stylesheets/bootstrap/_variables.scss          |  125 +-
 .../stylesheets/bootstrap/_wells.scss              |    0
 assets/stylesheets/bootstrap/mixins/_alerts.scss   |   14 +
 .../bootstrap/mixins/_background-variant.scss      |   11 +
 .../bootstrap/mixins/_border-radius.scss           |   18 +
 assets/stylesheets/bootstrap/mixins/_buttons.scss  |   52 +
 .../bootstrap/mixins/_center-block.scss            |    7 +
 assets/stylesheets/bootstrap/mixins/_clearfix.scss |   22 +
 assets/stylesheets/bootstrap/mixins/_forms.scss    |   88 +
 .../stylesheets/bootstrap/mixins/_gradients.scss   |   58 +
 .../bootstrap/mixins/_grid-framework.scss          |   81 +
 assets/stylesheets/bootstrap/mixins/_grid.scss     |  122 ++
 .../stylesheets/bootstrap/mixins/_hide-text.scss   |   21 +
 assets/stylesheets/bootstrap/mixins/_image.scss    |   33 +
 assets/stylesheets/bootstrap/mixins/_labels.scss   |   12 +
 .../stylesheets/bootstrap/mixins/_list-group.scss  |   31 +
 .../stylesheets/bootstrap/mixins/_nav-divider.scss |   10 +
 .../bootstrap/mixins/_nav-vertical-align.scss      |    9 +
 assets/stylesheets/bootstrap/mixins/_opacity.scss  |    8 +
 .../stylesheets/bootstrap/mixins/_pagination.scss  |   23 +
 assets/stylesheets/bootstrap/mixins/_panels.scss   |   24 +
 .../bootstrap/mixins/_progress-bar.scss            |   10 +
 .../bootstrap/mixins/_reset-filter.scss            |    8 +
 assets/stylesheets/bootstrap/mixins/_resize.scss   |    6 +
 .../bootstrap/mixins/_responsive-visibility.scss   |   21 +
 assets/stylesheets/bootstrap/mixins/_size.scss     |   10 +
 .../stylesheets/bootstrap/mixins/_tab-focus.scss   |    9 +
 .../stylesheets/bootstrap/mixins/_table-row.scss   |   28 +
 .../bootstrap/mixins/_text-emphasis.scss           |   11 +
 .../bootstrap/mixins/_text-overflow.scss           |    8 +
 .../bootstrap/mixins/_vendor-prefixes.scss         |  222 ++
 bootstrap-sass.gemspec                             |   20 +-
 bower.json                                         |   26 +-
 checksums.yaml.gz                                  |  Bin 267 -> 0 bytes
 composer.json                                      |    2 +-
 lib/bootstrap-sass.rb                              |   22 +-
 lib/bootstrap-sass/engine.rb                       |    7 +-
 lib/bootstrap-sass/sass_functions.rb               |   50 -
 lib/bootstrap-sass/version.rb                      |    4 +-
 metadata.yml                                       |  465 ++--
 package.json                                       |   30 +
 sache.json                                         |    5 +
 tasks/bower.rake                                   |   31 +
 tasks/converter.rb                                 |   12 +-
 tasks/converter/fonts_conversion.rb                |    2 +-
 tasks/converter/js_conversion.rb                   |   20 +-
 tasks/converter/less_conversion.rb                 |  230 +-
 tasks/converter/logger.rb                          |    1 +
 tasks/converter/network.rb                         |   72 +-
 templates/project/_bootstrap-variables.sass        |  867 ++++++++
 templates/project/_variables.scss.erb              |    3 -
 templates/project/manifest.rb                      |   33 +-
 templates/project/styles.sass                      |    6 +
 templates/project/styles.scss                      |    3 -
 test/compass_test.rb                               |    9 +-
 test/compilation_test.rb                           |   19 +-
 test/dummy/README.rdoc                             |    3 -
 test/dummy/app/assets/javascripts/application.js   |    2 -
 .../app/assets/stylesheets/application.css.sass    |    1 -
 test/dummy/app/views/pages/root.html.slim          |   41 -
 test/dummy/bin/bundle                              |    3 -
 test/dummy/bin/rails                               |    4 -
 test/dummy/bin/rake                                |    4 -
 test/dummy/config/application.rb                   |   17 -
 test/dummy/db/test.sqlite3                         |    0
 test/dummy/log/development.log                     |    0
 test/dummy/public/404.html                         |   58 -
 test/dummy/public/422.html                         |   58 -
 test/dummy/public/500.html                         |   57 -
 test/dummy/public/favicon.ico                      |    0
 .../apple-touch-icon-144-precomposed.png           |  Bin 0 -> 3549 bytes
 test/dummy_node_mincer/application.css.ejs.scss    |    6 +
 test/dummy_node_mincer/manifest.js                 |   87 +
 test/dummy_rails/README.rdoc                       |    3 +
 test/{dummy => dummy_rails}/Rakefile               |    0
 .../assets => dummy_rails/app/assets/images}/.keep |    0
 .../app/assets/javascripts/application.js          |    2 +
 .../app/assets/stylesheets/application.sass        |    2 +
 .../app/controllers/application_controller.rb      |    0
 .../app/controllers/pages_controller.rb            |    0
 .../app/helpers/application_helper.rb              |    0
 .../app/views/layouts/application.html.erb         |    0
 test/dummy_rails/app/views/pages/root.html.slim    |   84 +
 test/{dummy => dummy_rails}/config.ru              |    0
 test/dummy_rails/config/application.rb             |   30 +
 test/{dummy => dummy_rails}/config/boot.rb         |    0
 test/{dummy => dummy_rails}/config/environment.rb  |    0
 .../config/environments/development.rb             |    3 -
 .../config/environments/production.rb              |    8 +-
 .../config/environments/test.rb                    |   10 +-
 .../config/initializers/backtrace_silencers.rb     |    0
 .../initializers/filter_parameter_logging.rb       |    0
 .../config/initializers/inflections.rb             |    0
 .../config/initializers/mime_types.rb              |    0
 .../config/initializers/secret_token.rb            |    0
 .../config/initializers/session_store.rb           |    0
 .../config/initializers/wrap_parameters.rb         |    0
 test/{dummy => dummy_rails}/config/locales/en.yml  |    0
 test/{dummy => dummy_rails}/config/locales/es.yml  |    0
 test/{dummy => dummy_rails}/config/routes.rb       |    0
 test/{dummy => dummy_rails}/log/.keep              |    0
 test/dummy_sass_only/compile.rb                    |    8 +-
 test/gemfiles/sass_3_2.gemfile                     |    9 +-
 test/gemfiles/sass_3_3.gemfile                     |    6 +
 test/gemfiles/sass_3_4.gemfile                     |    7 +
 test/gemfiles/sass_head.gemfile                    |   12 +-
 test/node_mincer_test.rb                           |   36 +
 test/node_sass_compile_test.sh                     |    8 +
 test/pages_test.rb                                 |    6 +-
 test/sass_test.rb                                  |   15 +-
 test/sprockets_rails_test.rb                       |   18 +-
 test/support/dummy_rails_integration.rb            |   22 +
 test/support/integration_test.rb                   |   29 -
 test/support/reporting.rb                          |   17 +
 test/test_helper.rb                                |   40 +-
 test/test_helper_rails.rb                          |    6 +
 .../bootstrap/glyphicons-halflings-regular.eot     |  Bin 20335 -> 0 bytes
 .../bootstrap/glyphicons-halflings-regular.svg     |  229 --
 .../bootstrap/glyphicons-halflings-regular.ttf     |  Bin 41280 -> 0 bytes
 .../bootstrap/glyphicons-halflings-regular.woff    |  Bin 23320 -> 0 bytes
 vendor/assets/javascripts/bootstrap.js             |   12 -
 .../bootstrap/_component-animations.scss           |   29 -
 vendor/assets/stylesheets/bootstrap/_media.scss    |   56 -
 vendor/assets/stylesheets/bootstrap/_mixins.scss   |  947 --------
 vendor/assets/stylesheets/bootstrap/_print.scss    |  101 -
 .../bootstrap/_responsive-utilities.scss           |   74 -
 vendor/assets/stylesheets/bootstrap/bootstrap.scss |   49 -
 197 files changed, 7921 insertions(+), 3084 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list