[DRE-commits] [ruby-bootstrap-sass] 04/06: Merge tag 'upstream/3.1.1.0'
Sebastien Badia
sbadia-guest at moszumanska.debian.org
Mon Apr 21 14:02:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
sbadia-guest pushed a commit to branch master
in repository ruby-bootstrap-sass.
commit e2c6cf753a0b3af365510c53c95d086de712c33e
Merge: 53c62cd cdaa7e8
Author: Sebastien Badia <seb at sebian.fr>
Date: Wed Mar 19 00:56:35 2014 +0100
Merge tag 'upstream/3.1.1.0'
Upstream version 3.1.1.0
.gitignore | 9 +
.travis.yml | 9 +-
CHANGELOG.md | 77 +-
CONTRIBUTING.md | 18 +-
Gemfile | 10 +-
LICENSE | 27 +-
README.md | 235 ++--
Rakefile | 43 +-
asseturl.patch | 15 -
bootstrap-sass.gemspec | 35 +-
bower.json | 22 +
checksums.yaml.gz | Bin 0 -> 267 bytes
composer.json | 35 +
lib/bootstrap-sass.rb | 101 +-
lib/bootstrap-sass/compass_functions.rb | 14 -
lib/bootstrap-sass/engine.rb | 6 +-
lib/bootstrap-sass/rails_functions.rb | 14 -
lib/bootstrap-sass/sass_functions.rb | 50 +
lib/bootstrap-sass/version.rb | 4 +
metadata.yml | 366 +++++++
tasks/converter.rb | 78 ++
tasks/converter/char_string_scanner.rb | 38 +
tasks/converter/fonts_conversion.rb | 16 +
tasks/converter/js_conversion.rb | 39 +
tasks/converter/less_conversion.rb | 642 +++++++++++
tasks/converter/logger.rb | 56 +
tasks/converter/network.rb | 85 ++
templates/project/_variables.scss.erb | 3 +
templates/project/manifest.rb | 29 +-
templates/project/styles.scss | 6 +-
test/compass_test.rb | 8 +
test/compilation_test.rb | 10 +-
test/dummy/README.rdoc | 3 +
test/dummy/Rakefile | 6 +
test/dummy/app/assets/images/.keep | 0
test/dummy/app/assets/javascripts/application.js | 2 +
.../app/assets/stylesheets/application.css.sass | 1 +
.../app/controllers/application_controller.rb | 5 +
test/dummy/app/controllers/pages_controller.rb | 4 +
test/dummy/app/helpers/application_helper.rb | 2 +
test/dummy/app/views/layouts/application.html.erb | 14 +
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.ru | 4 +
test/dummy/config/application.rb | 17 +
test/dummy/config/boot.rb | 5 +
test/dummy/config/environment.rb | 5 +
test/dummy/config/environments/development.rb | 26 +
test/dummy/config/environments/production.rb | 76 ++
test/dummy/config/environments/test.rb | 30 +
.../config/initializers/backtrace_silencers.rb | 7 +
.../initializers/filter_parameter_logging.rb | 4 +
test/dummy/config/initializers/inflections.rb | 16 +
test/dummy/config/initializers/mime_types.rb | 5 +
test/dummy/config/initializers/secret_token.rb | 18 +
test/dummy/config/initializers/session_store.rb | 3 +
test/dummy/config/initializers/wrap_parameters.rb | 14 +
test/dummy/config/locales/en.yml | 3 +
test/dummy/config/locales/es.yml | 3 +
test/dummy/config/routes.rb | 3 +
test/dummy/db/test.sqlite3 | 0
test/dummy/lib/assets/.keep | 0
test/dummy/log/.keep | 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
test/dummy_sass_only/Gemfile | 4 +
test/dummy_sass_only/compile.rb | 13 +
test/dummy_sass_only/import_all.sass | 2 +
test/gemfiles/sass_3_2.gemfile | 12 +-
test/gemfiles/sass_head.gemfile | 11 +-
test/pages_test.rb | 14 +
test/sass_test.rb | 23 +
test/sprockets_rails_test.rb | 21 +
test/support/integration_test.rb | 29 +
test/test_helper.rb | 28 +-
update-bootstrap.sh | 25 -
.../bootstrap/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes
.../bootstrap/glyphicons-halflings-regular.svg | 229 ++++
.../bootstrap/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes
.../bootstrap/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes
.../assets/images/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
vendor/assets/images/glyphicons-halflings.png | Bin 12799 -> 0 bytes
vendor/assets/javascripts/bootstrap-affix.js | 117 --
vendor/assets/javascripts/bootstrap-alert.js | 99 --
vendor/assets/javascripts/bootstrap-button.js | 105 --
vendor/assets/javascripts/bootstrap-carousel.js | 207 ----
vendor/assets/javascripts/bootstrap-collapse.js | 167 ---
vendor/assets/javascripts/bootstrap-dropdown.js | 165 ---
vendor/assets/javascripts/bootstrap-modal.js | 247 -----
vendor/assets/javascripts/bootstrap-popover.js | 114 --
vendor/assets/javascripts/bootstrap-scrollspy.js | 162 ---
vendor/assets/javascripts/bootstrap-tab.js | 144 ---
vendor/assets/javascripts/bootstrap-tooltip.js | 361 -------
vendor/assets/javascripts/bootstrap-transition.js | 60 --
vendor/assets/javascripts/bootstrap-typeahead.js | 335 ------
vendor/assets/javascripts/bootstrap.js | 25 +-
vendor/assets/javascripts/bootstrap/affix.js | 137 +++
vendor/assets/javascripts/bootstrap/alert.js | 88 ++
vendor/assets/javascripts/bootstrap/button.js | 107 ++
vendor/assets/javascripts/bootstrap/carousel.js | 205 ++++
vendor/assets/javascripts/bootstrap/collapse.js | 170 +++
vendor/assets/javascripts/bootstrap/dropdown.js | 147 +++
vendor/assets/javascripts/bootstrap/modal.js | 243 +++++
vendor/assets/javascripts/bootstrap/popover.js | 110 ++
vendor/assets/javascripts/bootstrap/scrollspy.js | 153 +++
vendor/assets/javascripts/bootstrap/tab.js | 125 +++
vendor/assets/javascripts/bootstrap/tooltip.js | 399 +++++++
vendor/assets/javascripts/bootstrap/transition.js | 48 +
.../assets/stylesheets/bootstrap-responsive.scss | 1 -
vendor/assets/stylesheets/bootstrap.scss | 50 +-
.../assets/stylesheets/bootstrap/_accordion.scss | 34 -
vendor/assets/stylesheets/bootstrap/_alerts.scss | 104 +-
vendor/assets/stylesheets/bootstrap/_badges.scss | 55 +
.../assets/stylesheets/bootstrap/_breadcrumbs.scss | 22 +-
.../stylesheets/bootstrap/_button-groups.scss | 301 +++---
vendor/assets/stylesheets/bootstrap/_buttons.scss | 265 ++---
vendor/assets/stylesheets/bootstrap/_carousel.scss | 204 ++--
vendor/assets/stylesheets/bootstrap/_close.scss | 19 +-
vendor/assets/stylesheets/bootstrap/_code.scss | 58 +-
.../bootstrap/_component-animations.scss | 13 +-
.../assets/stylesheets/bootstrap/_dropdowns.scss | 268 +++--
vendor/assets/stylesheets/bootstrap/_forms.scss | 853 ++++++---------
.../assets/stylesheets/bootstrap/_glyphicons.scss | 233 ++++
vendor/assets/stylesheets/bootstrap/_grid.scss | 85 +-
.../assets/stylesheets/bootstrap/_hero-unit.scss | 25 -
.../stylesheets/bootstrap/_input-groups.scss | 162 +++
.../assets/stylesheets/bootstrap/_jumbotron.scss | 44 +
.../stylesheets/bootstrap/_labels-badges.scss | 83 --
vendor/assets/stylesheets/bootstrap/_labels.scss | 64 ++
vendor/assets/stylesheets/bootstrap/_layouts.scss | 16 -
.../assets/stylesheets/bootstrap/_list-group.scss | 110 ++
vendor/assets/stylesheets/bootstrap/_media.scss | 15 +-
vendor/assets/stylesheets/bootstrap/_mixins.scss | 1129 ++++++++++++--------
vendor/assets/stylesheets/bootstrap/_modals.scss | 148 ++-
vendor/assets/stylesheets/bootstrap/_navbar.scss | 893 +++++++++-------
vendor/assets/stylesheets/bootstrap/_navs.scss | 549 ++++------
.../assets/stylesheets/bootstrap/_normalize.scss | 423 ++++++++
vendor/assets/stylesheets/bootstrap/_pager.scss | 78 +-
.../assets/stylesheets/bootstrap/_pagination.scss | 175 ++-
vendor/assets/stylesheets/bootstrap/_panels.scss | 241 +++++
vendor/assets/stylesheets/bootstrap/_popovers.scss | 122 +--
vendor/assets/stylesheets/bootstrap/_print.scss | 101 ++
.../stylesheets/bootstrap/_progress-bars.scss | 104 +-
vendor/assets/stylesheets/bootstrap/_reset.scss | 216 ----
.../bootstrap/_responsive-1200px-min.scss | 28 -
.../bootstrap/_responsive-767px-max.scss | 193 ----
.../bootstrap/_responsive-768px-979px.scss | 19 -
.../stylesheets/bootstrap/_responsive-navbar.scss | 189 ----
.../bootstrap/_responsive-utilities.scss | 100 +-
.../assets/stylesheets/bootstrap/_scaffolding.scss | 127 ++-
vendor/assets/stylesheets/bootstrap/_sprites.scss | 197 ----
vendor/assets/stylesheets/bootstrap/_tables.scss | 336 +++---
vendor/assets/stylesheets/bootstrap/_theme.scss | 247 +++++
.../assets/stylesheets/bootstrap/_thumbnails.scss | 69 +-
vendor/assets/stylesheets/bootstrap/_tooltip.scss | 73 +-
vendor/assets/stylesheets/bootstrap/_type.scss | 321 +++---
.../assets/stylesheets/bootstrap/_utilities.scss | 53 +-
.../assets/stylesheets/bootstrap/_variables.scss | 962 +++++++++++++----
vendor/assets/stylesheets/bootstrap/_wells.scss | 14 +-
vendor/assets/stylesheets/bootstrap/bootstrap.scss | 106 +-
.../assets/stylesheets/bootstrap/responsive.scss | 48 -
166 files changed, 10553 insertions(+), 7044 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