root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
19,860 Commits 125 Branches 94 Tags 673 MiB
Commit Graph

1121 Commits

Author SHA1 Message Date
XhmikosR 6e732ace2c Run `grunt`. 
[ci skip]
 2015-08-30 00:01:30 +03:00
XhmikosR 606393502d Specify Internet Explorer 9 as the minimum supported version. 2015-08-25 18:52:27 +03:00
Mark Otto facb3a0c3c grunt 2015-08-24 22:34:46 -07:00
Mark Otto e7ed4ff283 grunt 2015-08-23 01:12:06 -07:00
Mark Otto 3453f55ec5 grunt 2015-08-23 01:00:29 -07:00
Mark Otto 47d5168dc8 grunt 2015-08-23 00:28:58 -07:00
Mark Otto 95292fd0e7 grunt 2015-08-23 00:26:03 -07:00
Mark Otto d4e7252a83 grunt 2015-08-23 00:18:35 -07:00
Mark Otto db87ffb0db grunt 2015-08-22 21:46:49 -07:00
Mark Otto 0644ce3703 grunt 2015-08-22 19:12:40 -07:00
Mark Otto 1f153b640d re-fix #16154 in v4-dev /cc #17101 2015-08-22 19:05:43 -07:00
Mark Otto a93c42bbbe grunt 2015-08-22 18:36:48 -07:00
Mark Otto 705fb5361e grunt 2015-08-20 15:06:36 -07:00
Mark Otto 0df8fae725 grunt 2015-08-18 20:25:35 -07:00
Mark Otto c369409a54 grunt 2015-08-18 19:26:21 -07:00
Mark Otto 4c7e4e4454 grunt 2015-08-18 01:06:40 -07:00
Mark Otto e8e7b2303f grunt 2015-08-18 00:59:48 -07:00
Mark Otto 03f21a75e5 grunt 2015-08-18 00:47:15 -07:00
Mark Otto c9ed01d972 grunt 2015-08-17 21:13:54 -07:00
Mark Otto be34e2fde6 grunt 2015-08-17 18:20:33 -07:00
Mark Otto f6925475dc grunt 2015-08-17 11:21:13 -07:00
Mark Otto 9a243f2b66 grunt 2015-08-17 11:19:22 -07:00
Mark Otto c064eef67b Massive cleanup 
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
 2015-08-14 22:45:55 -07:00
Mark Otto b2f9fe4a3e grunt it 2015-08-13 23:18:58 -07:00
Mark Otto 9b1ee31567 nuke the shared padding vars and assign to individual components 
- no real need for everything to be 100% shared
- padding looked and felt too large for inputs but not for buttons
- tying forms and buttons seems fine, but throwing in pagination feels wrong
 2015-08-13 23:04:16 -07:00
Mark Otto 879114a808 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 22:56:56 -07:00
Thomas McDonald d8acb36777 fix breadcrumbs libsass content 2015-08-12 22:14:58 -07:00
Mark Otto 28d399c436 grunt 2015-08-12 22:14:38 -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 a0ae458a8a grunt 2015-08-12 21:15:23 -07:00
Thomas McDonald 1d631e6ca3 remove .badge class from buttons 2015-08-12 21:07:41 -07:00
Mark Otto b1a74195c8 simpler type, docs callout for reproducing the v3 style headings and small text 2015-08-12 20:45:21 -07:00
Mark Otto 314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Mark Otto 28bcf047c8 container illustrations 2015-08-10 23:07:50 -07:00
Mark Otto 121615ceba dropdown fixes and dropdown docs tweaks 2015-08-10 16:31:28 -07:00
Mark Otto 6191e5e696 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-10 00:15:31 -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
Thomas McDonald b84bb4e218 Merge branch 'v4' into force-expanded 2015-08-09 23:33:52 -07:00
Thomas McDonald 0ef0825d01 specify expanded output style for generated css with libsass 
(also fix license banner generator bug)
 2015-08-09 23:16:43 -07:00
Mark Otto 491cc512ad build 2015-08-09 22:50:04 -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 7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto d318d64c08 grunt 2015-08-04 22:31:18 -07:00
Mark Otto 847470ca09 grunt 2015-06-22 23:25:18 -07:00
Mark Otto 96e7ceed90 grunt 2015-06-22 16:30:56 -07:00
Mark Otto e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto b39ce7d6c0 grunt 2015-06-18 15:48:54 -07:00
Mark Otto 840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto 2d094f9d0f grunt 2015-06-08 21:14:54 -07:00
Mark Otto c1a84e38c7 grunt 2015-05-31 23:53:14 -07:00
Mark Otto 38c7813c72 grunt 2015-05-29 13:09:57 -07:00
Mark Otto 43b083effb grunt 2015-05-29 02:09:44 -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 4238e2057f grunt 2015-05-22 22:34:04 -07:00
Mark Otto b8fa32edd2 le grunt 2015-04-29 12:02:02 -07:00
Mark Otto 52133e41c5 grunt 2015-04-29 11:42:53 -07:00
Mark Otto b9ed61854c grunt 2015-04-27 00:51:34 -07:00
Mark Otto 1770df724e update input groups to use new form control size classes 2015-04-23 01:14:43 -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 209cdf33f9 update navbar and nav link values 2015-04-18 18:15:24 -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 d64c93e09a grunt 2015-04-18 12:23:12 -07:00
Mark Otto abde088bde grunt 2015-04-17 16:50:07 -07:00
Mark Otto bf5931b5ee massive rewrite of forms docs and some css 2015-04-17 16:02:41 -07:00
Mark Otto 7c1635cdb8 narrower borders to get closer to 1px everywhere 2015-04-17 00:44:36 -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 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 650d168fd8 grunt 2015-04-15 15:30:41 -07:00
Mark Otto baad9d75ce grunt and docs 2015-04-14 01:01:37 -07:00
Mark Otto 53a3ff74ca redo sidenav 2015-04-13 19:00:59 -07:00
Mark Otto f522f1841e docs derp 2015-04-13 16:36:44 -07:00
Mark Otto 309264509d Remove grid sizing styles on tables 2015-03-30 18:11:43 -07:00
Mark Otto 6749e5509c rewrite table modifiers to use .table- prefix 2015-03-30 18:08:01 -07:00
Mark Otto 608be81a43 Fixes #13583: Move .sr-only and .sr-only-focusable to mixins, then use them to create classes in _utilities.scss 2015-03-30 17:36:00 -07:00
Mark Otto 6a2d456719 grunt dist and docs 2015-03-29 00:14:02 -07:00
Mark Otto 3f3f4c6420 grunt css 2015-03-11 19:19:26 +00:00
Mark Otto 928cfb0697 grunt css 2015-03-11 19:03:18 +00:00
Mark Otto 517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Mark Otto 4bed09aff8 grunt 2015-01-20 18:48:18 -08:00
Mark Otto e2c6dd29d8 tons of docs helpers cleanup 2015-01-19 16:15:51 -08:00
Mark Otto dfdb99c989 fix broken breadcrumb divider 2015-01-19 16:08:48 -08:00
Mark Otto 3fe96e8f50 fix border color on inverse tables 2015-01-19 15:52:40 -08:00
Mark Otto faedb7fec4 grunt 2015-01-19 14:55:25 -08:00
Chris Rebert 698b3a7ace grunt 2015-01-07 17:04:59 -08:00
Chris Rebert 0bd8c7cb6a grunt dist 2015-01-05 11:41:34 -08:00
Mark Otto 615eb99067 fix broke shit, recompile 2015-01-03 20:16:46 -08:00
Mark Otto c6af78e8a4 grunt 2015-01-01 12:13:28 -08:00
Mark Otto e4fa95eb57 grunt dist 2015-01-01 12:02:02 -08:00
Mark Otto a5e127fd16 grunt 2014-12-31 10:37:23 -08:00
Mark Otto b92534c632 improve code quality on custom forms 2014-12-25 15:40:24 -08:00
Mark Otto cd60cf3386 custom forms: checkbox and radio stacked option 2014-12-24 15:45:37 -08:00
Mark Otto 18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto 952be04cb0 grunt 2014-12-23 22:57:03 -08:00
Mark Otto f9aec74124 add [hidden] utility for hiding any html element (see #15274 for more context) 2014-12-23 04:10:59 -08:00
Mark Otto 547f16b58e rewrite all table styles to remove in selectors 2014-12-18 22:59:47 -08:00
Mark Otto 94753bc3ec grunt 2014-12-18 20:19:53 -08:00
Chris Rebert 90f4767d06 grunt dist 2014-12-17 15:26:12 -08:00
Mark Otto 1e136a70a2 Clean up some navbar.scss, drop the -float-breakpoint var entirely 2014-12-11 14:47:10 -08:00
Mark Otto 3737cb1d46 Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity 2014-12-11 14:12:10 -08:00
Mark Otto 2edc779391 Merge branch 'v4' into scss-lint 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	scss/_card.scss
 2014-12-11 12:07:09 -08:00
Mark Otto 2a78159a20 grunt 2014-12-11 12:06:08 -08:00
Mark Otto 0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
 2014-12-10 20:51:17 -08:00
Mark Otto 63d4423fc0 grunt 2014-12-10 13:49:53 -08:00
Mark Otto 2ade44a9ca inline-block on labels now instead of inline 2014-12-06 00:33:36 -08:00
Mark Otto ebfe358495 tweak label component padding 2014-12-06 00:18:11 -08:00
Mark Otto bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto 824f26a3c0 grunt dist 2014-12-04 15:29:53 -08:00
Mark Otto 2fa4ab8209 grunt 2014-12-04 15:20:45 -08:00
Mark Otto d0cffbb680 grunt dist 2014-12-04 01:03:54 -08:00
Mark Otto 4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Mark Otto 27df020852 convert to scss 2014-12-02 14:02:35 -08:00
Mark Otto 9180e15e33 Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse 2014-12-01 15:03:09 -08:00
Mark Otto 4bba2d0e0c fix more broke shit, run grunt 2014-11-30 20:29:47 -08:00
Mark Otto 12be9044f4 fix a bunch of padding and alignment things for forms 2014-11-25 18:00:52 -08:00
Mark Otto 15d98dc6b7 disable shadows on buttons for now 2014-11-25 17:47:32 -08:00
Mark Otto 2cc66cbb58 Merge branch 'master' into derp 
Conflicts:
	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/customizer-variables.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.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
	less/_variables.less
 2014-11-09 23:48:56 -08:00
Mark Otto eb74a8cbf3 darken primary blue for accessibility contrast on link colors 2014-11-09 23:11:28 -08:00
Mark Otto f17b636bce color contrast for links, gets us to 4.63:1 2014-11-09 23:01:50 -08:00
Mark Otto e020d50838 fix variable, run grunt 2014-11-09 22:05:09 -08:00
Mark Otto d1278efcc5 grunt 2014-11-09 18:04:00 -08:00
Mark Otto 46d1bf8eef Fixes #14234 again 
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
 2014-11-09 15:03:33 -08:00
Mark Otto df28b7e25f Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbars 2014-11-08 00:13:19 -08:00
Mark Otto 8fbb2bbbd1 Fixes #14979: Override .jumbotron padding within .container-fluid to match .container 2014-11-07 23:01:20 -08:00
Mark Otto 2862c30320 Fixes #15046: Add full font overrides for popovers and tooltips 2014-11-07 22:17:39 -08:00
Heinrich Fenkart 6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Mark Otto 94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Mark Otto c15aa36798 switch to max-width on containers 2014-10-27 03:07:34 -07:00
Mark Otto f26821a83a fix progress bar animated biznas 2014-10-26 22:48:12 -07:00
Mark Otto 783eced7ab follow up fix for #14837 /cc @hnrch02 2014-10-25 20:20:24 -07:00
Mark Otto 2c2564faef Fixes #14736: Reverts the remaining progress bar min value overrides from #12848 2014-10-25 19:10:03 -07:00
Mark Otto 38217ee405 Merge branch 'pr/14801' 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-10-25 18:16:40 -07:00
Mark Otto 6e3c55a115 grunt 2014-10-25 18:13:50 -07:00
Mark Otto a0e6bd96de grunt 2014-10-25 17:54:06 -07:00
Heinrich Fenkart 2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
XhmikosR 9f82f27b9d Update less/print.less to the latest html5 bp version. 
Also, keep the html5 boilerplate link in the built CSS.
 2014-10-13 13:32:39 +03:00
fat 4bbe80658a fixes #13816 Modal dialog closes when dragging and releasing mouse button outside dialog 2014-10-09 20:01:51 -07:00
XhmikosR 0ca71396b5 Update normalize.css to v3.0.2. 2014-10-07 11:29:59 +03:00
Mark Otto f75fc32462 grunt 2014-10-02 22:21:02 -07:00
Mark Otto 12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Mark Otto 121b204b14 grunt 2014-09-26 13:48:31 -07:00
Mark Otto 8e25695d09 Fixes #14687: Include video element in responsive embed 2014-09-26 13:45:28 -07:00
Heinrich Fenkart 7ce6824748 grunt 2014-09-25 02:23:48 +02:00
Mark Otto 4969c2055d grunt 2014-09-22 14:27:13 -07:00
Mark Otto d1660ad078 Swap -small and -large variables for -sm and -lg 2014-09-21 16:04:37 -07:00
Mark Otto 073389ca5e Rename .table-condensed to .table-sm 2014-09-17 22:14:27 -07:00
Mark Otto 1917b2d870 G R U N T 2014-09-17 22:00:12 -07:00
Mark Otto ca2711fc8e rewrite jumbotron less and make heading use a class 2014-09-17 20:03:32 -07:00
Mark Otto 86828fcd3d Some secondary button border action 2014-09-17 18:10:28 -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 6cec0399d0 grunt 2014-09-08 11:40:23 -07:00
Mark Otto c6d7d71549 Fixes #14557: Reset the bottom margin on .form-group:last-child in .navbar-form to prevent extra spacing 2014-09-08 10:57:50 -07:00
Mark Otto f2783fbf83 Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding 2014-09-08 10:29:45 -07:00
Mark Otto 5b7a5f84d4 Fixes #14437: Round the corners of table rows in panels as well as the cells 2014-09-04 19:06:01 -07:00
Mark Otto e37e06d73e Fixes #14443: Only transition what needs transitioning for thumbnails to avoid Safari/Chrome render bug 2014-09-01 12:48:19 -07:00
Mark Otto fe19211e4d Finish reverting #14444 2014-08-27 23:34:46 -07:00
Mark Otto 0ec05da0ee Undo the collapse visibility changes since it breaks our collapse plugin 2014-08-27 23:31:34 -07:00
Mark Otto aa25ce779d Fixes #14329: Fixed list-groups nested inside of collapsing panels, from @apexskier 2014-08-27 23:17:37 -07:00
Mark Otto 0a816e009f Fixes #14337: Round .jumbotron corners within .container and .container-fluid 2014-08-27 23:01:58 -07:00
Mark Otto 190452a36d typo 2014-08-27 22:40:46 -07:00
Mark Otto f4eefd28d1 Merge branch 'master' into sr_friendly_hidden_content 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-08-27 22:38:46 -07:00
Mark Otto 1ebc7e62a8 grunt 2014-08-27 22:37:10 -07:00
Mark Otto 56bb92ac4f Fixes #14386: Reset font, text, and line-height properties in popovers 2014-08-23 13:42:45 -07:00
Mark Otto 9a39ee90b4 Fixes #13943 again: lighten links, and text, in navbar. Still not 100% compliant, but it's better. 2014-08-23 13:26:37 -07:00
Mark Otto dfa2759a52 Fixes #14348: Add visibility styles to collapse and tab content to match .hidden 2014-08-23 12:25:27 -07:00
Mark Otto 3d5fd6f00d remove that 2014-08-05 17:49:22 -07:00
Mark Otto d4e58c755e fuck around with responsive reflow table idea 2014-08-05 17:45:24 -07:00
Mark Otto 25d6824e6c cards 2014-08-05 17:12:24 -07:00
Mark Otto ef9e76c2c5 comment out firefox specific code for linter to parse fully 2014-08-04 15:17:43 -07:00
Mark Otto 724240fe4f Merge branch 'master' into derp 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less
 2014-08-04 15:09:23 -07:00
Mark Otto 14e8ec2514 unfuck all that because lol dependencies 2014-08-04 10:14:11 -07:00
Mark Otto ae9c160932 Merge branch 'master' into derp 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-08-03 16:18:41 -07:00
Mark Otto 6424acf69a Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height 2014-08-02 21:16:32 -07:00
Mark Otto 9d0872b748 Fixes #14251: Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths 2014-08-02 19:05:46 -07:00
Mark Otto de77d04899 Merge branch 'master' into derp 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-08-02 18:46:11 -07:00
Mark Otto 67d39404a2 grunt 2014-08-02 18:41:00 -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 b9e6848dc8 Fixes #14253: Add borders for tables that follow bodies in panels 2014-08-02 13:55:02 -07:00
Mark Otto feed9aed5b Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers 2014-08-02 13:05:11 -07:00
Mark Otto 98d693ba7b Fixes #14142: Adding horizontal padding to captions in tables in panels. 2014-07-23 21:03:46 -07:00
Mark Otto 078aafe7fd Fixes #14221: Make .form-control-static work in inline forms as well 2014-07-23 20:54:07 -07:00
Mark Otto 6dde491ddf Fixes #14168: bold nested kbd elements 2014-07-23 20:49:47 -07:00
Mark Otto 5713bd74d6 Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ 2014-07-23 20:32:05 -07:00
Mark Otto 76368ef0a9 grunt dist 2014-07-14 09:04:47 -07:00
Mark Otto 4d6ab7c068 experiment with more utilities 2014-07-14 08:48:26 -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 66f7062e81 transitions mixin and global variable, add it to buttons 2014-07-13 13:31:07 -07:00
Mark Otto 5cfde0d3a5 Merge branch 'master' into derp 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	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/javascript/dropdowns.md
	less/utilities.less
 2014-07-12 16:15:45 -07:00
Mark Otto fe0ef38898 Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
Mark Otto 2962f845a5 grunt 2014-07-12 15:47:42 -07:00
Mark Otto 3e8cddf867 Fixes #13974, #14123: Remove translate3d repaint performance enhancement for text rendering and position wonkiness 2014-07-12 15:22:41 -07:00
Mark Otto bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
Mark Otto 6336895b96 Change `code` variables to match `pre` 2014-07-12 01:23:06 -07:00
Mark Otto a63c066e3d rearrange a few things; drop compiled theme file 2014-07-11 22:46:10 -07:00
Mark Otto 857fe32a70 Refactor navs: new classes, remove separate pills & tabs files, drop justified nav because it never really worked 2014-07-09 16:04:31 -07:00
Mark Otto 77a4bcad9e Drop the deprecated .visible-* classes (because we replaced them with .visible-*-block, -inline-block, -inline 2014-07-09 13:58:27 -07:00
Mark Otto 02fe0ecc31 Drop deprecated code from Less files 2014-07-09 13:54:32 -07:00
Mark Otto a0d8c62f18 more navs work 2014-07-09 13:51:49 -07:00
Mark Otto 41f3af407b Merge branch 'derp' into derp_navs 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-07-09 10:48:58 -07:00
Mark Otto 54537b500e Refactor: drop all custom .progress-bar styles and replace with <progress> element 2014-07-09 01:39:34 -07:00
XhmikosR 643effe382 Run `grunt`. 2014-07-09 10:24:39 +03:00
Mark Otto a8625f452e Badges, navs, and more 2014-07-09 00:15:20 -07:00
Mark Otto f380ca21e2 Use .box-shadow() mixin so we can enable/disable them 2014-07-08 21:19:14 -07:00
Mark Otto c825629ffe Nuke all IE8 fallbacks and comments and hacks 2014-07-08 19:20:45 -07:00
Mark Otto 0e47ce959c move tabs and pills to separate files with unique classes 2014-07-08 19:00:48 -07:00
Mark Otto 6c7a6b4691 rems: table padding 2014-07-08 17:39:29 -07:00
Mark Otto e6d64a5455 Nuke unused vars for panels wells and thumbnails 2014-07-08 17:32:03 -07:00
Mark Otto 5e1adc10bb Bring back button info 2014-07-08 17:30:11 -07:00
Mark Otto f399d21ef5 Revamp button: rename .btn-default to .btn-secondary, drop .btn-info 2014-07-08 17:09:47 -07:00
Mark Otto 542f9973ed Fix navbar margins and update grid sidebar styles to match 2014-07-08 16:39:46 -07:00
Mark Otto f6367bc0e4 Implement the new border-radius guard: only round things if global @enable-rounded == true 2014-07-08 16:25:01 -07:00
Mark Otto f05365f73b rems: update breadcrumbs to use new sizing; improve variables by renaming @breadcrumb-separator to @breadcrumb-divider; change up colors 2014-07-08 16:00:52 -07:00
Mark Otto 8582659d5c Refactor: drop .dropdown .caret for a generated caret using .dropdown-toggle:after 2014-07-08 14:23:34 -07:00
Mark Otto 9c319d67ee Drop: Thumbnails completely, as they'll be replaced 2014-07-08 04:00:35 -07:00
Mark Otto 527eccaa9f Drop: Panels completely, as they'll be replaced 2014-07-08 03:56:47 -07:00
Mark Otto 9f53f9aea1 rems: rework grid system vars to use rems/ems 2014-07-08 03:14:27 -07:00
Mark Otto a06a35d27a Drop: Device-named container variables since we alreay sort of deprecated them many releases ago 2014-07-08 02:55:07 -07:00
Mark Otto 74ac24aa59 Drop: deprecated .dropdown-menu.pull-right styles 2014-07-08 02:40:35 -07:00
Mark Otto 4139545da2 rems: input sizes 2014-07-08 02:31:33 -07:00
Mark Otto b50498acd4 Clean up variable alignment and comments; change grays to new custom values 2014-07-08 02:26:50 -07:00
Mark Otto d7b38d8c4a Drop: all vendor prefix mixins because autoprefixer 2014-07-08 02:04:48 -07:00
Mark Otto 6fda409853 Fix input sizing and increase vertical padding on textareas 2014-07-08 01:44:09 -07:00
Mark Otto 8d50d4a684 rems: buttons 2014-07-08 01:22:02 -07:00
Mark Otto 413750a03c rems: code 2014-07-08 01:02:59 -07:00
Mark Otto dae5ec5416 Drop Glyphicons 2014-07-08 00:33:21 -07:00
Mark Otto b29268dc48 drop wells 2014-07-08 00:25:13 -07:00
Mark Otto 97008c381a restore font-weight and knock down font-size for .lead 2014-07-08 00:10:31 -07:00
Mark Otto f5024eb13a start the move to rems 2014-07-07 23:36:40 -07:00
Mark Otto 81b59d3536 Merge branch 'master' into derp 
Conflicts:
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/docs.min.js
	docs/assets/js/src/application.js
 2014-07-07 22:10:22 -07:00
Mark Otto a0d8d56593 grunt 2014-07-07 00:59:51 -07:00
Mark Otto 8e2348e9ed Fixes #13746: Add docs section for brand image 2014-07-06 18:39:37 -07:00
Mark Otto 9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
Mark Otto e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto 043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto 9677c95d83 Fixes #13967: Don't reset the cite element's font-style 2014-07-05 20:02:02 -07:00
Mark Otto f22e7d857a Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress 2014-07-05 20:01:18 -07:00
Mark Otto 0378a6be2a Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 2014-07-05 19:59:50 -07:00
Mark Otto 3c99de9764 grunt 2014-07-05 19:57:15 -07:00
Mark Otto 3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
Mark Otto fcf9470a20 typo 2014-07-02 23:35:37 -07:00
Mark Otto 96b545c6b5 Fixes #13989: Don't extend the input sizes; manually chain the selectors 2014-07-02 23:14:23 -07:00
Mark Otto b4958aba69 merge in and resolve conflicts 2014-07-02 22:54:56 -07:00
XhmikosR 225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
XhmikosR fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto 4045740c54 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-06-25 16:57:22 -07:00
Mark Otto e40df7cfac fixes #13912: make radios/checkboxes work with inline forms again 2014-06-25 16:56:36 -07:00
XhmikosR 4abb095783 Run `grunt`. 
Revert a991cd572c.
 2014-06-25 02:07:17 +03:00
Chris Rebert a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
XhmikosR 15c63fa137 Run `grunt`. 2014-06-24 19:01:40 +03:00
Mark Otto df7cfe8652 Fixes #13903: Restore side padding on .btn-block 2014-06-23 10:38:45 -07:00
Mark Otto e98fc373e3 Fixes #13872 more: add overrides for lg and sm input modifiers 2014-06-20 13:24:14 -07:00
Mark Otto 1e53dcd137 Fixes #13872: Always apply padding to .form-control-static for that vertical alignment 2014-06-19 18:33:41 -07:00
Mark Otto a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
XhmikosR abe7afd87a Run `grunt`. 2014-06-19 12:58:34 +03:00
Mark Otto 99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto 74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto 74a264fb98 fixes #13021: add .form-group-sm/-lg 2014-06-18 18:19:17 -07:00
Mark Otto 46e8a5817d fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly 2014-06-18 17:34:09 -07:00
Mark Otto fdf174e498 grunt dist 2014-06-18 15:46:38 -07:00
XhmikosR 6d45f733e5 Run `grunt`. 2014-06-18 13:16:32 +03:00
Chris Rebert 8bee6549ad grunt dist 2014-06-17 18:23:14 -07:00
Mark Otto f09d6b7a98 grunt 2014-06-10 23:15:09 -07:00
Mark Otto 5c1357b3e9 grunt 2014-06-10 22:58:21 -07:00
Mark Otto 7bcd78847f grunt 2014-06-10 22:51:17 -07:00
Mark Otto dcbe484a09 New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. 2014-06-10 21:20:34 -07:00
Mark Otto 631e04b6fc Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 2014-06-10 20:50:58 -07:00
Mark Otto c0e82accad grunt 2014-06-10 20:17:22 -07:00
Mark Otto 4aca4cf866 grunt for table change 2014-06-10 00:26:20 -07:00
Mark Otto 8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
Mark Otto 85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto 5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto d1872b4c98 Merge branch 'master' into pr/13736 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-06-08 13:57:44 -07:00
Mark Otto 5cd72ce230 grunt 2014-06-08 13:55:40 -07:00
Mark Otto 1e3b93804f grunt 2014-06-08 11:18:59 -07:00
Ben Zumhagen 5872a7e0ac Resolves Issue #13689 
Doing this the right way this time. Hiding .panel-footer top border when
preceeded by a .list-group. This should resolve the "double border"
issue.
 2014-06-04 22:18:40 -04:00
Mark Otto fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Chris Rebert 1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Mark Otto d4c7248749 grunt dist 2014-05-12 20:26:01 -07:00
Mark Otto f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Mark Otto 4c3ef52fc1 Merge branch 'pr/13320' 
Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-04-30 19:48:22 -07:00
Mark Otto 108b7c390e grunt dist 2014-04-30 19:47:56 -07:00
Mark Otto b217357252 grunt dist 2014-04-30 19:35:47 -07:00
Mark Otto bfb99413ee grunt dist 2014-04-06 20:49:22 -07:00
XhmikosR 4c2626fecb Run `grunt`. 2014-04-03 10:53:44 +03:00
XhmikosR 10586bf040 Run `grunt`. 2014-03-27 08:02:51 +02:00
Mark Otto acf5707323 Fixes #13066: Add z-index to the form control feedback icons so input groups don't render on top of them 2014-03-24 20:07:54 -07:00
Mark Otto b4f4c7b16f Fixes #13037: add text-align: left; to prevent alignment change in dropdowns 2014-03-24 20:02:56 -07:00
Mark Otto 6951b48e65 grunt 2014-03-24 20:01:46 -07:00
Mark Otto 6f6bce5944 Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text 2014-03-24 19:26:41 -07:00
Mark Otto 21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
Chris Rebert 0dc88edeb9 grunt dist 2014-03-20 01:16:01 -07:00
fat dd7cab84f6 build 2014-03-16 18:44:58 -07:00
XhmikosR f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +02:00
Mark Otto a83ca38713 Fixes #13003: Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin 2014-03-10 16:41:56 -07:00
Mark Otto 30deb5697c grunt 2014-03-09 22:06:14 -07:00
Mark Otto a15c24410b Fixes #12759 
Ensures proper sizing and alignment of input groups within inline and
navbar forms.

* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`
 2014-03-09 21:25:51 -07:00
Mark Otto b4d66b7f6b Fixes #12738 
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
 2014-03-09 20:45:32 -07:00
Mark Otto 1a5fb4ef24 Fixes #12843: Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form 2014-03-09 17:22:52 -07:00
Mark Otto 2f955907f9 Fixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs 2014-03-09 17:12:39 -07:00
Mark Otto ef5d8e98e2 Merge branch 'master' into sr-only-focusable 
Conflicts:
	dist/css/bootstrap.css
 2014-03-08 20:34:29 -08:00
Mark Otto 67c747a109 grunt 2014-03-08 15:30:18 -08:00
Bas Bosman de27e729da Do csscomb earlier in build phase 2014-03-07 13:39:07 +01:00
mrmrs d1d5d90413 Fixes #12748 2014-03-07 00:59:22 -08:00
Mark Otto 5bd2799978 G R U N T 2014-03-07 00:26:38 -08:00
Mark Otto 6452b409aa grunt for days 2014-03-07 00:23:22 -08:00
Mark Otto 164b41b28d Fixes #12937: Darken active button states just a smidge more 2014-03-07 00:19:26 -08:00
Mark Otto 705ff7f227 Moving the embed to it's own CSS file, moving the docs to the Components page with an example, fixing a Glyhpicons list problem in the docs 2014-03-06 23:18:13 -08:00
Mark Otto 12c619f5b9 Merge branch 'master' into boulox-responsive-embed 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-03-06 22:40:25 -08:00
Mark Otto 7e299c6a49 Fixes #12683: Remove the overflow: hidden; from the .panel-group > .panel because it apparently serves no purpose and cuts off nested dropdown menus. 2014-03-06 22:32:21 -08:00
Mark Otto 0c9308a3b2 Rewrite the disabled list group items to simplify styles 2014-03-06 21:40:22 -08:00
Mark Otto c8614c0f15 Merge branch 'master' into pr/12490 
Conflicts:
	less/list-group.less
 2014-03-06 21:32:52 -08:00
Mark Otto 9dc796155c Fixes #12722: Fixes up responsive tables in print 
Safari renders this fine for one reason or another, but Chrome still renders the media query styles to make tables responsive. This change scopes them to screen devices only, so printing looks boss everywhere.
 2014-03-06 21:25:34 -08:00
Mark Otto 17e41098c8 Fixes #12824: Remove white-space: nowrap from code elements 2014-03-06 20:39:19 -08:00
Mark Otto 10eb167e35 Fixes #12901: Refactors list group active state for use on non-anchors 2014-03-04 22:42:13 -08:00
Mark Otto 24de9b0994 Fixes #12848: Account for and document progress bars at 0-3% 2014-03-04 16:55:15 -08:00
Mark Otto 026e2f8d30 Grunt after merging #12863 2014-03-04 14:24:09 -08:00
Mark Otto 7733f24373 Fixes #12868: Enables icon feedback on validation states for large/small inputs. 
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
 2014-03-04 14:12:57 -08:00
Mark Otto f45df64670 Fixes #12914: Darken immediate children hr elements in jumbotrons 2014-03-04 13:54:09 -08:00
Mark Otto e381635b1f Fixes #12593: Add support for table bodies and table rows to the collapse plugin 2014-03-03 21:39:53 -08:00
XhmikosR e5affbfa0a Run `grunt`. 2014-03-01 20:58:53 +02:00
Mark Otto 66a229bdbf Fixes #12822: Scope panel collapse styles to immediate panel bodies only 2014-02-22 22:46:03 -08:00
Mark Otto 7b60470e9b Fixes #12801: Add padding to the bottom of .form-control-static to match height of standard form controls 2014-02-22 14:16:11 -08:00
Mark Otto 7e551ecaf7 Update modals to use more consistent padding—modal body and footer now match modal header 2014-02-22 12:38:56 -08:00
Mark Otto 4ccf088a24 Merge branch 'master' into pr/12813 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-22 12:20:53 -08:00
Mark Otto b99be29f32 Fixes #12756: Ensure horizontal dls are cleared by moving the clearfix out of the media query 2014-02-22 12:13:11 -08:00
Supergibbs 49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
Mark Otto 4b622c60c1 grunt 2014-02-21 17:42:25 -08:00
Mark Otto 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Mark Otto eb20d6f132 Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders 2014-02-11 14:20:01 -08:00
Mark Otto 769339ed18 grunt dist 2014-02-08 17:30:40 -08:00
Mark Otto 44bb7b20c7 Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last 2014-02-08 17:29:10 -08:00
Mark Otto e9199718d6 Merge branch 'master' into fix-12154 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 16:52:22 -08:00
Mark Otto 26e2d7cdc9 grunt 2014-02-08 16:13:30 -08:00
Mark Otto e3cfd5821d Merge branch 'master' into pr/12462 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 16:01:56 -08:00
Mark Otto c8315edd73 Merge branch 'master' into pr/12639 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 15:37:35 -08:00
Mark Otto 06f1293acf Merge branch 'master' into panels_and_tables 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-07 18:36:27 -08:00
Mark Otto a2f08158d0 Nuke shit I added in 4d7b2ddba9 that shouldn't come until v4 2014-02-07 15:44:50 -08:00
Bas Bosman a0052b5a37 Drop -o-user-select 2014-02-07 14:14:32 +01:00
Mark Otto 4d7b2ddba9 Fixes #12486: Restore full width inputs for input groups in inline forms and navbars 2014-02-07 02:58:10 -08:00
Mark Otto d91d9b0ade Fixes #12447: Properly reset borders on table cells in panels 2014-02-07 02:38:01 -08:00
Mark Otto 3ccc16cad0 grunt for days 2014-02-07 02:24:37 -08:00