Mark Otto
|
b648a77ed3
|
Merge branch 'master' into v4
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.eot
dist/fonts/glyphicons-halflings-regular.svg
dist/fonts/glyphicons-halflings-regular.ttf
dist/fonts/glyphicons-halflings-regular.woff
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/labels.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/responsive-utilities.html
docs/_includes/css/sass.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/affix.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/overview.html
docs/_includes/js/tabs.html
docs/_includes/nav/components.html
docs/_includes/nav/css.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
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/dist/fonts/glyphicons-halflings-regular.eot
docs/dist/fonts/glyphicons-halflings-regular.svg
docs/dist/fonts/glyphicons-halflings-regular.ttf
docs/dist/fonts/glyphicons-halflings-regular.woff
docs/examples/carousel/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/non-responsive/non-responsive.css
docs/examples/sticky-footer-navbar/index.html
docs/examples/theme/index.html
fonts/glyphicons-halflings-regular.eot
fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.ttf
fonts/glyphicons-halflings-regular.woff
less/_carousel.less
less/_forms.less
less/glyphicons.less
|
2014-11-30 20:17:45 -08:00 |
|
Mark Otto
|
86af1f39ab
|
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
_config.yml
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/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.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/_layouts/default.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/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/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
|
2014-11-09 22:02:53 -08:00 |
|
Mark Otto
|
9796f56fa1
|
title change
|
2014-10-27 04:52:48 -07:00 |
|
Mark Otto
|
b091dd5e86
|
rename new navbar to just navbar
|
2014-10-27 04:52:22 -07:00 |
|
Mark Otto
|
77250e1451
|
drop the old navbar
|
2014-10-27 04:52:07 -07:00 |
|
Mark Otto
|
674c2ff224
|
fix up the new navbar docs
|
2014-10-27 04:49:24 -07:00 |
|
Mark Otto
|
f26821a83a
|
fix progress bar animated biznas
|
2014-10-26 22:48:12 -07:00 |
|
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
|
073389ca5e
|
Rename .table-condensed to .table-sm
|
2014-09-17 22:14:27 -07:00 |
|
Mark Otto
|
ca2711fc8e
|
rewrite jumbotron less and make heading use a class
|
2014-09-17 20:03:32 -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
|
d4e58c755e
|
fuck around with responsive reflow table idea
|
2014-08-05 17:45:24 -07:00 |
|
Mark Otto
|
668dc448a7
|
bigger images
|
2014-08-05 17:23:25 -07:00 |
|
Mark Otto
|
60e64015de
|
fix broke code block
|
2014-08-05 17:21:54 -07:00 |
|
Mark Otto
|
d71f6470c1
|
copy and remove rogue p tag
|
2014-08-05 17:21:13 -07:00 |
|
Mark Otto
|
adefbf6ebe
|
copy on badges
|
2014-08-05 17:16:28 -07:00 |
|
Mark Otto
|
25d6824e6c
|
cards
|
2014-08-05 17:12:24 -07:00 |
|
Mark Otto
|
089d434895
|
Merge branch 'master' into derp
Conflicts:
_config.yml
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/glyphicons.html
docs/_includes/css/forms.html
docs/_includes/css/tables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/dropdowns.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.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/docs.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/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
less/code.less
less/panels.less
less/variables.less
|
2014-08-02 18:30:59 -07:00 |
|
Mark Otto
|
8ff37bdb23
|
markdownify jumbotron docs
|
2014-07-14 09:14:48 -07:00 |
|
Mark Otto
|
35e68dcc33
|
markdownify label docs
|
2014-07-14 09:14:41 -07:00 |
|
Mark Otto
|
2879b93624
|
example page header
|
2014-07-14 09:14:31 -07:00 |
|
Mark Otto
|
108c395ad4
|
new navbar tweaks
|
2014-07-14 08:48:33 -07:00 |
|
Mark Otto
|
cdb0f8229e
|
move scaffolding stuff back to layout once more, split off the type docs to typography section
|
2014-07-14 08:34:56 -07:00 |
|
Mark Otto
|
8d55c3c0a3
|
move containers to layout section
|
2014-07-14 08:22:33 -07:00 |
|
Mark Otto
|
e6ee1b228f
|
inverse table idea
|
2014-07-14 00:23:46 -07:00 |
|
Mark Otto
|
d60d34231a
|
table headers
|
2014-07-13 23:45:34 -07:00 |
|
Mark Otto
|
3e896193ab
|
new navbar ideas
|
2014-07-13 23:33:54 -07:00 |
|
Mark Otto
|
aa22440acb
|
move media to layout
|
2014-07-13 01:28:19 -07:00 |
|
Mark Otto
|
1b35ec9be5
|
fix helpers
|
2014-07-13 01:26:48 -07:00 |
|
Mark Otto
|
9c90f36dae
|
markdownify button group
|
2014-07-13 01:23:34 -07:00 |
|
Mark Otto
|
4a5f1f036b
|
markdownify button dropdowns
|
2014-07-13 01:23:29 -07:00 |
|
Mark Otto
|
35d87bcb25
|
markdownify responsive embed
|
2014-07-13 01:17:54 -07:00 |
|
Mark Otto
|
4aec90fa08
|
markdownify pagination
|
2014-07-13 01:17:50 -07:00 |
|
Mark Otto
|
3000dccada
|
markdownify page header
|
2014-07-13 01:17:46 -07:00 |
|
Mark Otto
|
bdc144c3bb
|
markdownify media
|
2014-07-13 01:12:11 -07:00 |
|
Mark Otto
|
a39f0f6d21
|
markdownify list group
|
2014-07-13 01:12:06 -07:00 |
|
Mark Otto
|
7d3ad78fc7
|
markdownify input group
|
2014-07-13 01:12:02 -07:00 |
|
Mark Otto
|
5904bacbb3
|
frontmatter that shit up
|
2014-07-13 00:59:31 -07:00 |
|
Mark Otto
|
722d00eadf
|
move typography
|
2014-07-13 00:57:28 -07:00 |
|
Mark Otto
|
7a70a8988b
|
move responsive embed
|
2014-07-12 02:13:32 -07:00 |
|
Mark Otto
|
55c660102e
|
move pagination
|
2014-07-12 02:13:29 -07:00 |
|
Mark Otto
|
0479394e0a
|
move page-header
|
2014-07-12 02:13:26 -07:00 |
|
Mark Otto
|
a2fd9a4e90
|
move navbar
|
2014-07-12 02:13:23 -07:00 |
|
Mark Otto
|
8baf692dc6
|
move media
|
2014-07-12 02:13:20 -07:00 |
|
Mark Otto
|
7407ee2da2
|
move list group
|
2014-07-12 02:13:16 -07:00 |
|
Mark Otto
|
f5c63e11b8
|
move label
|
2014-07-12 02:13:13 -07:00 |
|
Mark Otto
|
88db2b5970
|
move jumbotron
|
2014-07-12 02:13:09 -07:00 |
|
Mark Otto
|
ba74329ba6
|
move input group
|
2014-07-12 02:13:05 -07:00 |
|
Mark Otto
|
9650374012
|
move button group
|
2014-07-12 02:12:59 -07:00 |
|
Mark Otto
|
deb720c94c
|
move button dropdowns
|
2014-07-12 02:12:55 -07:00 |
|