0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

234 Commits

Author SHA1 Message Date
Mark Otto
879114a808 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 22:56:56 -07:00
Mark Otto
faacbdb49f Remove .help-block entirely
- Fixes #13267 somewhat.
- Instead of a single, block-level class, let's use a combination of existing elements and classes.
- For block-level help text, use p.text-muted.
- For inline-level help text, use span.text-muted or small.text-muted.
2015-08-12 22:14:31 -07:00
Thomas McDonald
454fc7c03a add example for disabled pager link 2015-08-12 21:17:33 -07:00
Mark Otto
5e928c7c2b Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 21:16:56 -07:00
Mark Otto
067311f44b basic docs fix for badges in list group, still needs more changes 2015-08-12 21:15:19 -07:00
Jacob Thornton
11abb0f7e9 fix modal 2015-08-12 21:12:03 -07:00
Mark Otto
314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Thomas McDonald
9305fd378f fix scrollspy example 2015-08-12 19:49:08 -07:00
Mark Otto
37eb1e1d8b fix well to card 2015-08-11 12:28:28 -07:00
Mark Otto
58051f959f tweak collapse docs 2015-08-11 09:50:36 -07:00
Mark Otto
c74e47a139 rewrite alerts docs a bit 2015-08-10 16:36:44 -07:00
Mark Otto
121615ceba dropdown fixes and dropdown docs tweaks 2015-08-10 16:31:28 -07:00
Mark Otto
9fe6b85c32 rewrite dropdown events in markdown 2015-08-10 16:16:39 -07:00
Mark Otto
03c91b83bd simplify some button docs copy 2015-08-10 16:11:44 -07:00
Mark Otto
58e03cd4bf tweak buttons docs 2015-08-10 00:05:40 -07:00
Mark Otto
743717fbce really fix those outline buttons 2015-08-09 23:45:36 -07:00
Mark Otto
eaeee93fa3 docs rearrange 2015-08-09 23:38:16 -07:00
Mark Otto
68e4d897ba shoutout to outline buttons 2015-08-09 22:48:48 -07:00
Mark Otto
08d6dc5b71 add basic figure support 2015-08-09 21:42:47 -07:00
Mark Otto
7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -07:00
Mark Otto
31a47369bb content 2015-08-09 20:28:46 -07:00
Mark Otto
c6d5fee88a transitions and text changes 2015-08-08 21:37:48 -07:00
Mark Otto
7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto
14d8c29596 fix broken markup 2015-08-05 23:50:27 -07:00
Mark Otto
36800a2740 primary btn there as well 2015-08-05 23:15:12 -07:00
Mark Otto
be299c1b8b switch to primary button there 2015-08-05 23:14:53 -07:00
Mark Otto
fed0d8a2d4 restore page headers, use partial and page frontmatter to organize it 2015-08-05 17:47:45 -07:00
Mark Otto
97bcfb9e7f rip badges 2015-08-05 00:48:42 -07:00
Mark Otto
8a7e08ebd2 docs twerks 2015-08-05 00:46:27 -07:00
Mark Otto
9330c4a947 Run just as fast as I can
To the middle of nowhere
To the middle of my frustrated fears
And I swear you're just like a pill
Instead of makin' me better,
You keep makin' me ill
You keep makin' me ill

adds .label-pill to replace .badge
2015-08-05 00:45:41 -07:00
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto
18da568b8b rewrite some navbar stuff, clean out some commented out code 2015-06-22 23:24:55 -07:00
Mark Otto
9b5fe0ca46 clarify some stuff about small navbar; also renamed navbar-condensed to -sm 2015-06-22 16:30:52 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
331b8d2250 Add 21x9 responsive embed modifier
- Credit: @adammacias
- Fixes #16499
2015-06-18 16:01:52 -07:00
Mark Otto
e615ae053c overhaul nav and shit again
- drop the index pages save for examples
- comment out the extend section for now
- fix up spacing fix on team list
2015-06-13 14:05:25 -07:00
Mark Otto
6e3054be68 components index 2015-06-13 13:26:05 -07:00
Mark Otto
9863eb75d2 move spacing utils to separate file, document them a bit 2015-06-01 01:19:02 -07:00
Mark Otto
7c552d70fc fix utils ToC listing by unnesting headings 2015-05-29 14:05:31 -07:00
Mark Otto
71bcf0dd0b update cards docs to clarify things, fix remaining broken cards 2015-05-29 13:09:07 -07:00
Mark Otto
b455ed8def add markdown toc stuff 2015-05-29 01:58:52 -07:00
Mark Otto
74d17ab7a0 rewrite much of cards and the docs 2015-05-28 14:07:34 -07:00
Mark Otto
6e3d4331db new card sizing maybe 2015-05-27 19:00:11 -07:00
Mark Otto
663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Mark Otto
68bcb89291 Update buttons.md 2015-04-30 14:39:57 -07:00
Mark Otto
8174f6c409 update buttons role copy
/cc @cvrebert @patrickhlauke
2015-04-30 11:40:54 -07:00
Mark Otto
a999a0aff2 remove some callouts on buttons by rewriting things a bit 2015-04-29 11:44:19 -07:00
Mark Otto
847b7bc71e fix up file example 2015-04-27 00:51:31 -07:00
Mark Otto
aee20f7ffc docs note 2015-04-26 07:49:11 -07:00
Chris Rebert
4c3c402b0e forms.md: fix typo 2015-04-23 17:33:35 -07:00
Chris Rebert
ff85ad1472 card.md: fix typo 2015-04-23 17:17:48 -07:00
Chris Rebert
cfcc597c85 reboot.md: fix typo 2015-04-23 16:30:12 -07:00
Mark Otto
fe6756485f add card grid sizing 2015-04-23 01:33:19 -07:00
Mark Otto
37e543759b scope grid example styles better 2015-04-23 01:30:55 -07:00
Mark Otto
490294e68b Fix up some form docs styles, sizing, etc 2015-04-23 01:10:14 -07:00
Mark Otto
dc3abb5f12 Update labels and form grid examples 2015-04-23 00:51:39 -07:00
Mark Otto
b45d719e37 more reboot edits 2015-04-22 23:13:11 -07:00
Mark Otto
46a3506a42 clarify some docs, improve layout 2015-04-22 23:09:05 -07:00
Mark Otto
8f94078da8 New form control sizing, new navbar condensed variation, update nav and navbar spacing 2015-04-18 18:12:10 -07:00
Mark Otto
7e86bfd9ac change nav to use index files for each section; stub out index views for everything 2015-04-18 12:28:50 -07:00
Mark Otto
81fb03406e move responsive embed to utilities docs, update the nav to dedupe things 2015-04-17 21:07:09 -07:00
Mark Otto
b326ecdd65 move js tabs docs to navs docs page 2015-04-17 20:59:22 -07:00
Mark Otto
fe203ec382 reorganize code docs 2015-04-17 20:19:51 -07:00
Mark Otto
bf085b1a02 delete the .page-header and its docs 2015-04-17 20:00:38 -07:00
Mark Otto
a7f4fc5849 rewrite alert docs 2015-04-17 19:51:15 -07:00
Mark Otto
4b58ee15b5 remove some typography docs from that page because they're covered in the reboot 2015-04-17 17:18:36 -07:00
Mark Otto
a4aa650d7d move custom forms docs to the forms docs page 2015-04-17 16:50:02 -07:00
Mark Otto
611a127a1e change the type scale a bit again 2015-04-17 16:49:48 -07:00
Mark Otto
bf5931b5ee massive rewrite of forms docs and some css 2015-04-17 16:02:41 -07:00
Mark Otto
7f3c85ecdc remove nested .bd-example 2015-04-17 14:24:11 -07:00
Mark Otto
8b93787fd2 move all JS buttons docs to regular buttons docs page, rewrite the callouts and some docs verbage 2015-04-17 14:11:08 -07:00
Mark Otto
0156f9a237 move remaining files to components subdir 2015-04-17 12:41:49 -07:00
Mark Otto
e70d9077f0 move buttons from content to components 2015-04-17 12:40:25 -07:00
Mark Otto
f58143e7d6 editing intro 2015-04-17 12:39:39 -07:00
Mark Otto
a73946b08d move text utilities docs from type to utilities 2015-04-17 01:31:09 -07:00
Mark Otto
e782a9b580 rename helpers to utilities in docs, matching the scss file 2015-04-17 01:03:16 -07:00
Mark Otto
7049a07444 More reboot work, commenting out things that have been moved over 2015-04-17 00:22:35 -07:00
Mark Otto
cbf0e25280 nav and typo 2015-04-16 23:04:42 -07:00
Mark Otto
b1f48d3098 more reboot updates 2015-04-16 19:33:42 -07:00
Mark Otto
0ab1576ae2 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-16 18:54:17 -07:00
Mark Otto
605990400e collapsing navbar tools 2015-04-16 18:50:32 -07:00
Mark Otto
06c2862d25 start stubbing out a new reboot section and file 2015-04-16 18:39:45 -07:00
Mark Otto
466d36e541 Redo all our callouts with the custom callout plugin
- Replaces manual use of .bd-callout with {% callout [type] %}
- Rearranged some callouts for proximity to others
- Turned long lists of callouts--like those on tooltips, plugings, etc--into a list because holy shit that's overwhelming
2015-04-16 16:56:40 -07:00
Mark Otto
c84cf4f7f5 rename classes from .bs-docs and .bs to .bd 2015-04-16 14:07:20 -07:00
Mark Otto
f98883fc44 move more js stuff to components section 2015-03-30 20:55:00 -07:00
Mark Otto
fad885fd8a Consolidate alerts docs into single page 2015-03-30 20:50:34 -07:00
Mark Otto
c86a8736c6 Consolidate dropdown docs into single page 2015-03-30 18:23:35 -07:00
Mark Otto
e29455814f typo 2015-03-09 14:50:40 +00:00
Mark Otto
5f2872c561 input groups: drop the tooltips warning, move accessibility notice to a sub section 2015-03-09 14:48:51 +00:00
Mark Otto
81259b9c4c simplify input group docs to remove two notices, condense some language 2015-03-09 14:46:32 +00:00
Mark Otto
454cc55e31 remove justified button groups 2015-03-09 14:32:30 +00:00
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/breadcrumbs.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/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.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/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.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/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.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/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Mark Otto
35e5f6f169 copy 2015-01-20 21:55:20 -08:00
Mark Otto
4a3ae1cf45 fix dupe images 2015-01-20 21:12:31 -08:00
Mark Otto
33e32bffc8 new headers, ad placements, intro paragraphs on several pages, etc 2015-01-19 20:03:08 -08:00
Mark Otto
e2c6dd29d8 tons of docs helpers cleanup 2015-01-19 16:15:51 -08:00
Mark Otto
29c7a0f002 fix quick floats example 2015-01-19 16:11:29 -08:00
Mark Otto
43e45ce06c consolidate forms docs 2015-01-19 16:00:56 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_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
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	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/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Chris Rebert
0bd8c7cb6a grunt dist 2015-01-05 11:41:34 -08:00