Merge branch '2.0-wip'
Conflicts: .gitignore LICENSE Makefile bootstrap.css bootstrap.min.css docs/assets/js/application.js docs/assets/js/google-code-prettify/prettify.css docs/index.html docs/javascript.html examples/container-app.html examples/fluid.html examples/hero.html js/bootstrap-alerts.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tabs.js js/bootstrap-twipsy.js js/tests/index.html js/tests/unit/bootstrap-modal.js js/tests/unit/bootstrap-popover.js js/tests/unit/bootstrap-tabs.js lib/forms.less lib/mixins.less lib/patterns.less lib/scaffolding.less lib/tables.less
Showing
This diff is collapsed.
bootstrap.min.css
deleted
100644 → 0
This diff is collapsed.
docs/assets/bootstrap.zip
0 → 100644
File added
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
128 KB
82.5 KB
49.6 KB
76.4 KB
40.9 KB
7.09 KB
51.1 KB
29.8 KB
42.3 KB
398 Bytes
4.25 KB
4.25 KB
316 Bytes
305 Bytes
213 Bytes
345 Bytes
117 Bytes
172 Bytes
301 Bytes
292 Bytes
405 Bytes
1.09 KB
370 Bytes
312 Bytes
452 Bytes
264 Bytes
12.8 KB
1.15 KB
1.05 KB
1.47 KB
docs/base-css.html
0 → 100644
This diff is collapsed.
docs/build/index.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/build/package.json
0 → 100644
This diff is collapsed.
docs/components.html
0 → 100644
This diff is collapsed.
docs/download.html
0 → 100644
This diff is collapsed.
docs/examples.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/less.html
0 → 100644
This diff is collapsed.
docs/scaffolding.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/upgrading.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
examples/fluid-reverse.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
img/glyphicons-halflings.png
0 → 100644
This diff is collapsed.
js/README.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
js/bootstrap-carousel.js
0 → 100644
This diff is collapsed.
js/bootstrap-collapse.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
js/bootstrap-transition.js
0 → 100644
This diff is collapsed.
js/bootstrap-typeahead.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
js/tests/vendor/jquery.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
less/accordion.less
0 → 100644
This diff is collapsed.
less/alerts.less
0 → 100644
This diff is collapsed.
less/bootstrap.less
0 → 100644
This diff is collapsed.
less/breadcrumbs.less
0 → 100644
This diff is collapsed.
less/button-groups.less
0 → 100644
This diff is collapsed.
less/buttons.less
0 → 100644
This diff is collapsed.
less/carousel.less
0 → 100644
This diff is collapsed.
less/close.less
0 → 100644
This diff is collapsed.
less/code.less
0 → 100644
This diff is collapsed.
This diff is collapsed.
less/dropdowns.less
0 → 100644
This diff is collapsed.
lib/forms.less
→
less/forms.less
100755 → 100644
This diff is collapsed.
less/grid.less
0 → 100644
This diff is collapsed.
less/hero-unit.less
0 → 100644
This diff is collapsed.
less/labels.less
0 → 100644
This diff is collapsed.
less/layouts.less
0 → 100644
This diff is collapsed.
less/mixins.less
0 → 100644
This diff is collapsed.
less/modals.less
0 → 100644
This diff is collapsed.
less/navbar.less
0 → 100644
This diff is collapsed.
less/navs.less
0 → 100644
This diff is collapsed.
less/pager.less
0 → 100644
This diff is collapsed.
less/pagination.less
0 → 100644
This diff is collapsed.
less/patterns.less
0 → 100644
This diff is collapsed.
less/popovers.less
0 → 100644
This diff is collapsed.
This diff is collapsed.
less/progress-bars.less
0 → 100644
This diff is collapsed.
This diff is collapsed.
less/responsive.less
0 → 100644
This diff is collapsed.
less/scaffolding.less
0 → 100644
This diff is collapsed.
less/sprites.less
0 → 100644
This diff is collapsed.
less/tables.less
0 → 100644
This diff is collapsed.
less/thumbnails.less
0 → 100644
This diff is collapsed.
less/tooltip.less
0 → 100644
This diff is collapsed.
This diff is collapsed.
less/utilities.less
0 → 100644
This diff is collapsed.
less/variables.less
0 → 100644
This diff is collapsed.
less/wells.less
0 → 100644
This diff is collapsed.
lib/mixins.less
deleted
100644 → 0
This diff is collapsed.
lib/patterns.less
deleted
100644 → 0
This diff is collapsed.
lib/scaffolding.less
deleted
100644 → 0
This diff is collapsed.
lib/tables.less
deleted
100644 → 0
This diff is collapsed.
lib/variables.less
deleted
100644 → 0
This diff is collapsed.