Mark Otto
|
d6b0f45fb7
|
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/dropdowns.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/less.html
docs/_includes/css/overview.html
docs/_includes/css/responsive-utilities.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/getting-started.html
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/components.html
docs/components/navbar.md
docs/css.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
docs/getting-started.html
docs/javascript.html
docs/migration.html
less/_animation.less
less/_modal.less
less/_navbar.less
less/_variables.less
less/glyphicons.less
less/navs.less
less/panels.less
less/progress-bars.less
|
2014-10-26 22:31:59 -07:00 |
|
Mark Otto
|
9f2aeafe85
|
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
|
2014-09-17 15:21:31 -07:00 |
|
Mark Otto
|
0181d3c643
|
move license and translations to about section
|
2014-08-05 17:19:12 -07:00 |
|
Mark Otto
|
5c9bcb72fb
|
link the new navbar examples
|
2014-07-14 09:05:27 -07:00 |
|
Mark Otto
|
346bb975b3
|
markdown for 3rd party
|
2014-07-12 02:06:18 -07:00 |
|
Mark Otto
|
0d84bc1979
|
markdown for template
|
2014-07-12 02:06:13 -07:00 |
|
Mark Otto
|
95bd06cca6
|
markdown for disable responsive
|
2014-07-12 02:06:05 -07:00 |
|
Mark Otto
|
7c0c51c9d6
|
move remaining getting started files to new folder
|
2014-07-12 01:52:44 -07:00 |
|
Mark Otto
|
c2527e4870
|
Redo license FAQs in markdown
|
2014-07-12 00:54:37 -07:00 |
|
Mark Otto
|
c20e130a92
|
Redo community section in markdown
|
2014-07-12 00:54:29 -07:00 |
|
Mark Otto
|
b5441d8650
|
Redo browser/device support in markdown
|
2014-07-12 00:45:11 -07:00 |
|
Mark Otto
|
2346b17d05
|
Redo translations in markdown
|
2014-07-11 23:55:59 -07:00 |
|
Mark Otto
|
2bbbf55180
|
Move accessibility to markdown
|
2014-07-11 23:46:47 -07:00 |
|
Mark Otto
|
e8bd019a19
|
move all css files over to components dir
|
2014-07-10 20:02:47 -07:00 |
|
Mark Otto
|
4993ab6e00
|
start markdowning getting started and moving things to separate pages
|
2014-07-10 17:54:06 -07:00 |
|