root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15,666 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

962 Commits

Author SHA1 Message Date
Mark Otto 401ace65f4 add indeterminate checkbox support 2015-01-01 12:01:55 -08:00
Mark Otto 1a932b7e02 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-31 10:39:56 -08:00
Chris Rebert a0dbe55678 add missing global declaration for SimpleJekyllSearch 2014-12-29 12:42:31 -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 73e59c26e6 basic docs search 2014-12-24 02:44:38 -08:00
Mark Otto 977646d7a0 grunt 2014-12-22 19:48:48 -08:00
Mark Otto c4a23cc040 grunt 2014-12-22 19:18:26 -08:00
Mark Otto 28d847a1e0 grunt 2014-12-20 23:05:23 -08:00
Chris Rebert f24a1cb28d remove remaining remnants of the Customizer 2014-12-17 13:44:52 -08:00
Mark Otto e0a9a7722f Merge pull request #14 from twbs/nuke_customizer 
Nuke the customizer
 2014-12-11 12:21:05 -08:00
Mark Otto 2a78159a20 grunt 2014-12-11 12:06:08 -08:00
XhmikosR 4e27c48248 Run `grunt`. 2014-12-11 08:24:31 +02:00
Mark Otto 95da2a9428 nuke the customizer 2014-12-10 13:51:43 -08:00
Chris Rebert 37183edfd5 Customizer: Catch and properly report compile errors that Less.js's toCSS() can throw. 
Currently these errors are only reported in the JavaScript console, not in the Customizer UI.
Refs #15296

[skip sauce]
[skip validator]
 2014-12-05 13:06:01 -08:00
Matt Smith dbe4765416 Nested button groups with only one child now have rounded corners (Iss.#15270) 2014-12-03 11:44:35 -05:00
Mark Otto 75943868be update home and side nav to use new navbar structure 2014-12-01 15:41:11 -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 7a799af939 fixes and grunt 2014-11-30 21:01:50 -08:00
Mark Otto 4bba2d0e0c fix more broke shit, run grunt 2014-11-30 20:29:47 -08:00
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
XhmikosR 61bbe74df1 Update devDependencies. 2014-11-30 12:51:16 +02:00
Mark Otto bcb90ef3a0 Bump Glyphicons to v1.9 2014-11-30 01:31:49 -08:00
Mark Otto 9928144dc4 Fixes #15241: Add simple example to docs for collapse plugin 2014-11-29 23:03:47 -08:00
Mark Otto 23bdfc45eb grunt 2014-11-29 21:40:04 -08:00
Mark Otto 9c049c99e2 grunt 2014-11-29 20:58:14 -08:00
Mark Otto 80d7be1126 grunt 2014-11-29 18:36:21 -08:00
Mark Otto c901287394 remove more mentions of theme 2014-11-29 15:01:44 -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 7ca73b7542 fix margin on .bs-example thumbs 2014-11-25 17:10:47 -08:00
XhmikosR 7ea49019b8 Run `grunt`. 2014-11-24 09:53:42 +02:00
Heinrich Fenkart c2abfc0a44 grunt 2014-11-17 18:57:02 +01:00
Mark Otto 9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
Mark Otto 143c4a2f8f grunt 2014-11-12 08:51:35 -08:00
Mark Otto ff386147ce grunt 2014-11-11 20:25:09 -08:00
Patrick H. Lauke 9391ef207f aria-hidden added to some stray glyphicons 
plus minor tweak to customizer's generated alerts
 2014-11-11 22:41:21 +00:00
XhmikosR bf4a331f1a Run `grunt`. 2014-11-10 12:55:26 +02: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 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 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 852eef9689 grunt 2014-11-08 00:10:53 -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 f85c5921dd grunt 2014-11-05 20:11:46 +01:00
Heinrich Fenkart d77546963b Customizer: Remove file type check from config import 
Fixes #14978.
 2014-11-05 19:14:52 +01:00
Heinrich Fenkart e27dc5d71e grunt 2014-11-05 01:56:18 +01:00
Heinrich Fenkart db90ff6df7 grunt 2014-11-05 01:45:16 +01:00
Heinrich Fenkart 6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Heinrich Fenkart 1582039193 Use autoprefixer for Customizer builds 2014-11-04 19:34:29 +01:00
Heinrich Fenkart d107004278 Remove duplicate code from Customizer/Gruntfile by sharing it 2014-11-04 12:35:38 +01:00
Chris Rebert 594831f4f3 Add event.relatedTarget + `data-*` example to Modal docs 
Fixes #14245
 2014-11-03 13:37:27 -08:00
Heinrich Fenkart a2c0bb49b1 grunt 2014-10-31 11:09:01 +01:00
Heinrich Fenkart 12b3ba7278 Customizer: listen to the right event for manual file selection in import 2014-10-31 10:58:03 +01:00
Heinrich Fenkart b91474e538 grunt 2014-10-31 10:31:56 +01:00
Heinrich Fenkart b8c3c5c19b grunt 2014-10-30 04:45:04 +01:00
Mark Otto 16dbdbd7a2 Merge branch 'master' into v3.3.0 
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
 2014-10-29 11:56:48 -07:00
Mark Otto 15d668dd15 grunt 2014-10-29 11:13:25 -07:00
Mark Otto 5429e71401 fixes #14913: badges in list group shouldn't have text shadow 2014-10-29 10:27:18 -07:00
Mark Otto e07d741088 grunt 2014-10-29 09:54:43 -07:00
Mark Otto 22f9c8fc0a grunt 2014-10-29 08:58:51 -07:00
Mark Otto 94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Mark Otto a369a0a729 grunt 2014-10-29 08:51:05 -07:00
Mark Otto a75c6d84e1 grunt 2014-10-28 23:08:42 -07:00
Heinrich Fenkart cf88a65f30 Fix customizer download with Firefox. 2014-10-29 06:48:00 +02:00
Heinrich Fenkart bf2ad00ee0 grunt 2014-10-29 04:56:02 +01:00
Heinrich Fenkart 94b544c229 grunt 2014-10-29 04:44:52 +01:00
Heinrich Fenkart a7f58a8356 grunt 2014-10-29 04:30:31 +01:00
Mark Otto a5497da5be grunt 2014-10-27 20:37:17 -07:00
Mark Otto e3d2146350 fix rounded corners on copy buttons 2014-10-27 03:23:44 -07:00
Mark Otto c15aa36798 switch to max-width on containers 2014-10-27 03:07:34 -07:00
Mark Otto d896faa1b9 grunt 2014-10-27 01:35:02 -07:00
Mark Otto 252583b661 grunt 2014-10-26 23:07:20 -07:00
Mark Otto dcee894a8c grunt 2014-10-26 22:57:38 -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 05c785bfae grunt 2014-10-26 14:42:06 -07:00
Heinrich Fenkart 66e140db82 Docs: progress bars' animation now needs to be manually toggled 
Refs #14409
 2014-10-26 20:43:41 +01:00
Heinrich Fenkart 2cbb1d9374 grunt 2014-10-26 04:39:49 +01:00
Mark Otto 783eced7ab follow up fix for #14837 /cc @hnrch02 2014-10-25 20:20:24 -07:00
Heinrich Fenkart 5f2e6fa58b grunt 2014-10-26 03:53:10 +01:00
Heinrich Fenkart 44cc763229 grunt 2014-10-26 03:17:19 +01: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 3fcd65af41 Fixes #14806: reset the text-shadow in the themed buttons 2014-10-25 18:57:27 -07:00
Mark Otto 9bf9aab132 grunt 2014-10-25 18:29:15 -07:00
Mark Otto 41a26ced24 Fixes #14814: Use the link active bg variables for theme navbar gradients 2014-10-25 18:27:40 -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
Mark Otto 018c1c0b6e Merge pull request #14871 from twbs/fix-#14810 
Move "Copy" button in `code`.
 2014-10-25 17:49:13 -07:00
Heinrich Fenkart e9d6f256c2 grunt 2014-10-26 01:59:25 +02:00
XhmikosR db550a9235 Run `grunt`. 2014-10-25 14:12:21 +03:00
XhmikosR 0ba39d45b4 Move "Copy" button in code. 2014-10-25 01:48:02 +03:00
Mark Otto 23e3995cec guhrunt 2014-10-24 13:24:28 -07:00
Heinrich Fenkart 51f1f58be8 grunt 2014-10-23 06:39:51 +02:00
Heinrich Fenkart 9814256736 Merge pull request #14852 from twbs/jquery-version-check 
Add jQuery version check to existing jQuery presence check
 2014-10-23 06:15:36 +02:00
Heinrich Fenkart 1604af041b Add jQuery version check to existing jQuery presence check 
Fixes #14809.
Closes #14825.
 2014-10-23 05:57:15 +02:00
Heinrich Fenkart e0cea19cbc grunt 2014-10-23 05:23:29 +02:00
Heinrich Fenkart 40c309b39a grunt 2014-10-22 21:39:37 +02:00
Heinrich Fenkart 2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
XhmikosR 27478b966b Run `grunt`. 
[ci skip]
 2014-10-22 14:18:18 +03:00
XhmikosR 961ed36f01 Update Holder.js to v2.4.1. 
[ci skip]
 2014-10-22 14:18:13 +03:00
XhmikosR 40ce5670e7 Update JSZip to v2.4.0. 
[ci skip]
 2014-10-22 14:17:48 +03:00
Heinrich Fenkart 930c422f22 grunt 2014-10-22 04:28:16 +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
Heinrich Fenkart 4a89fd02b7 grunt 2014-10-10 08:35:56 +02:00
XhmikosR 9299f5dfa2 Run `grunt`. 
[ci skip]
 2014-10-09 08:17:56 +03:00
XhmikosR a1a2dfebb5 Update less.js to v1.7.5. 2014-10-09 08:16:32 +03:00
XhmikosR 924c68f8bb Update FileSaver.js v2014-08-29. 2014-10-09 08:16:32 +03:00
XhmikosR 7ded2d185d Update Blob.js to v2014-07-24. 2014-10-09 08:16:31 +03:00
XhmikosR 07f1d89dd2 Run `grunt`. 2014-10-07 19:57:01 +03:00
Heinrich Fenkart 5bb08c50fa grunt 2014-10-03 08:17:49 +02:00
Mark Otto f75fc32462 grunt 2014-10-02 22:21:02 -07:00
Mark Otto 76268c4b96 more grunt 2014-10-02 21:21:49 -07:00
Mark Otto f579b66b80 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	docs/assets/js/raw-files.min.js
 2014-10-02 21:19:43 -07:00
Mark Otto 12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Heinrich Fenkart 68b80836cf grunt 2014-10-03 05:20:23 +02:00
Heinrich Fenkart 32162b16cb grunt 2014-10-01 21:10:33 +02: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 0d04dcaebd grunt 2014-09-26 00:10:41 +02: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
Heinrich Fenkart 36ebec5e76 grunt 2014-09-22 21:47:24 +02:00
Mark Otto d1660ad078 Swap -small and -large variables for -sm and -lg 2014-09-21 16:04:37 -07:00
Mark Otto e33922eb06 grunt 2014-09-18 19:11:47 -07:00
Mark Otto 98b745a06b grunt 2014-09-18 19:00:30 -07:00
Mark Otto 75204aeafa grunt 2014-09-18 18:33:52 -07:00
Mark Otto 1917b2d870 G R U N T 2014-09-17 22:00:12 -07:00
Mark Otto 92e81718a3 Use .clearfix mixin instead of overflow on examples 2014-09-17 21:43:46 -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
Heinrich Fenkart 5a5cf224e1 grunt 2014-09-16 05:59:09 +02:00
Heinrich Fenkart 16f9529ed1 grunt 2014-09-16 05:40:03 +02:00
Heinrich Fenkart d0f76e416c grunt 2014-09-13 04:46:31 +02:00
Heinrich Fenkart 0a4c39dc40 Teh grunt 
https://www.youtube.com/watch?v=L-4VxEtWyRo
 2014-09-13 03:15:04 +02:00
Heinrich Fenkart 0cf94b82ee grunt 2014-09-13 02:42:18 +02:00
Heinrich Fenkart cabace78da G R U N T 2014-09-11 23:43:27 +02:00
Heinrich Fenkart 9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +02:00
Heinrich Fenkart 9702579aeb run `grunt` 2014-09-09 00:12:33 +02:00
Heinrich Fenkart c9602c29c3 grunt 2014-09-08 22:41:45 +02:00
Mark Otto 6cec0399d0 grunt 2014-09-08 11:40:23 -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 48a1308e5d grunt 2014-09-08 10:23:25 -07:00
XhmikosR 5b9fcea9f2 Run `grunt`. 2014-09-08 09:04:33 +03:00
Mark Otto 551306fe9d grunt 2014-08-28 17:22:08 -07:00
Mark Otto 783e001786 grunt 2014-08-27 23:35:54 -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 f5890adb17 grunt 2014-08-27 22:25:24 -07:00
Mark Otto 0140198699 grunt 2014-08-23 13:46:28 -07:00
Mark Otto 32a6d9b404 Full grunt 2014-08-23 13:43:41 -07:00
Mark Otto 4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto 6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Chris Rebert e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
Chris Rebert 71c2c372f6 Fix #14411 by setting JSON Content-Type for Gist API request 2014-08-17 15:41:53 -07:00
Mark Otto 9096c20021 grunt 2014-08-04 14:05:12 -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
XhmikosR de1d8c36ad Run `grunt`. 2014-08-01 19:49:54 +03:00
Thomas Welton 9739271c04 Add drag and drop config import; closes #11004 
Closes #13790 by merging a rebased version of it.
 2014-07-31 11:45:21 -07:00
XhmikosR 97cb2803d7 Run `grunt`. 2014-07-22 08:31:36 +03:00
XhmikosR caed585033 Update Filesaver.js to v2014-07-21. 2014-07-22 08:29:06 +03:00
XhmikosR 5c569dc4d4 Update Blob.js to the latest version. 2014-07-22 08:29:06 +03:00
XhmikosR 8d435cbb3c Run `grunt`. 2014-07-22 08:25:41 +03:00
Chris Rebert b3d068f2d3 regenerate docs/assets/js/docs.min.js 2014-07-15 17:21:39 -07:00
Chris Rebert 11db482371 popover dismiss-on-next-click example: instead of <button>, use <a> w/ tabindex 
Fixes #14038.

Research supporting this choice of approach:
    https://gist.github.com/cvrebert/68659d0333a578d75372

Why not <button>?
Even with a `tabindex` attribute, they don't gain focus when clicked upon in:
    * Mac OS X Firefox 30.0
    * Mac OS X Safari 7.0.5
 2014-07-15 16:57: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 fecbaca907 grunt some more things, rebuild customizer nav 2014-07-12 18:11:07 -07:00
Mark Otto 7a8d9dbdbf grunt 2014-07-12 18:06:26 -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 717a50ce19 grunt 2014-07-12 15:37:13 -07:00
Mark Otto bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
Mark Otto cabb86d126 Merge branch 'master' into derp 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/_includes/components/progress-bars.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
 2014-07-11 00:38:28 -07:00
Mark Otto 4993ab6e00 start markdowning getting started and moving things to separate pages 2014-07-10 17:54:06 -07:00
Mark Otto fb775bae21 fix sidenav js 2014-07-10 00:24:34 -07:00
XhmikosR 94472ee74a Run `grunt`. 2014-07-10 10:03:24 +03:00
XhmikosR e598247bcc Update uglify-js to v2.4.15. 2014-07-10 10:02:41 +03:00
Mark Otto dae1a68fb1 Merge branch 'master' into derp 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-07-09 22:19:23 -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 d738c8729b remove commented out docs js 2014-07-09 02:44:11 -07:00
Mark Otto b5242d3068 nuke ie8 responsive file warning js 2014-07-09 02:43:25 -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
XhmikosR d88a837fea Update uglify-js to v2.4.14. 2014-07-09 10:22:43 +03:00
Mark Otto a8625f452e Badges, navs, and more 2014-07-09 00:15:20 -07:00
Mark Otto 97008c381a restore font-weight and knock down font-size for .lead 2014-07-08 00:10:31 -07:00
Chris Rebert 5d1abf8b38 Merge pull request #14036 from twbs/fix-13575 
Jekyll: Use non-minified assets when not running from GitHub Pages
 2014-07-07 19:36:32 -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 b44d4ef724 grunt 2014-07-06 15:35:24 -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 354d423668 grunt 2014-07-06 15:08:37 -07:00
Mark Otto 043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto d55462fae8 grunt 2014-07-05 20:10:44 -07:00