root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
13,745 Commits 111 Branches 92 Tags 671 MiB
Commit Graph

658 Commits

Author SHA1 Message Date
XhmikosR f4a44208f4 Run grunt. 2015-07-26 00:16:58 +03:00
Mark Otto 847470ca09 grunt 2015-06-22 23:25:18 -07:00
Mark Otto 278804fa31 grunt 2015-06-22 16:33:23 -07:00
Mark Otto 96e7ceed90 grunt 2015-06-22 16:30:56 -07:00
Mark Otto bc29c016b7 Merge branch 'v4' into v4_builds 2015-06-19 16:26:33 -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 8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00
Mark Otto 83bfff7f07 bump version 2015-06-16 09:10:22 -07:00
Mark Otto 29ff44d311 grunt 2015-06-16 09:06:51 -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
XhmikosR b5ed74d43d Run `grunt`. 
[ci skip]
 2015-06-01 10:29:18 +03: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
XhmikosR c56032a0e5 Remove grunt-banner completely. 
Add a license header in theme instead.
 2015-05-16 12:57:27 +03:00
Mark Otto 588b7e564e grrrrrrrrrrrrrrrrrrrunt 2015-05-14 11:11:03 -07:00
Mark Otto 82279a8eb2 Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders 2015-05-13 21:20:02 -07:00
XhmikosR 414d0a535a Run `grunt`. 2015-05-05 11:57:42 +03:00
XhmikosR 5ae00f2e7c Run `grunt`. 2015-05-05 06:50:18 +03: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
XhmikosR 5ca44f94ac Run `grunt`. 2015-04-28 14:24:37 +03:00
Bootstrap's Grunt bot e6438592e9 automatic `grunt dist` 
[ci skip]
 2015-04-28 09:20:25 +00:00
XhmikosR 2bc9d70069 Update clean-css to v3.2.6. 2015-04-28 12:12:05 +03:00
Bootstrap's Grunt bot a9137bd621 automatic `grunt dist` 
[ci skip]
 2015-04-28 08:19:19 +00:00
Bootstrap's Grunt bot d87b7a037b automatic `grunt dist` 
[ci skip]
 2015-04-27 18:30:49 +00:00
Bootstrap's Grunt bot 71597a4424 automatic `grunt dist` 
[ci skip]
 2015-04-27 08:20:49 +00:00
Mark Otto b9ed61854c grunt 2015-04-27 00:51:34 -07:00
Martin Bean 9a451d4aea Add @btn-border-radius variables (#16271) 2015-04-26 17:42:34 +01:00
Bootstrap's Grunt bot d0926f2deb automatic `grunt dist` 
[ci skip]
 2015-04-26 11:11:05 +00:00
XhmikosR fa4d7d2bd2 Run `grunt`. 2015-04-26 14:03:35 +03:00
Bootstrap's Grunt bot 2b89fd5289 automatic `grunt dist` 
[ci skip]
 2015-04-26 06:40:33 +00:00
Bootstrap's Grunt bot f5b5fc69a8 automatic `grunt dist` 
[ci skip]
 2015-04-26 05:20:36 +00:00
Bootstrap's Grunt bot 2900711db4 automatic `grunt dist` 
[ci skip]
 2015-04-26 04:50:34 +00:00
Bootstrap's Grunt bot 3e3b331ad3 automatic `grunt dist` 
[ci skip]
 2015-04-25 20:20:30 +00: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
Bootstrap's Grunt bot 063c1b0780 automatic `grunt dist` 
[ci skip]
 2015-04-22 05:30:27 +00:00
Bootstrap's Grunt bot 48232aad6c automatic `grunt dist` 
[ci skip]
 2015-04-22 04:50:38 +00:00
Bootstrap's Grunt bot 7993251b1c automatic `grunt dist` 
[ci skip]
 2015-04-22 01:01:07 +00:00
Bootstrap's Grunt bot b5f3cd37f2 automatic `grunt dist` 
[ci skip]
 2015-04-21 06:40:36 +00: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 80239a3da4 grunt 2015-04-17 20:59:26 -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
Bootstrap's Grunt bot 483412a795 automatic `grunt dist` 
[ci skip]
 2015-04-17 16:20:21 +00: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
Bootstrap's Grunt bot e7064c7224 automatic `grunt dist` 2015-04-13 17:21:14 +00:00
Bootstrap's Grunt bot a719eb69d2 automatic `grunt dist` 2015-04-13 00:21:28 +00:00
Bootstrap's Grunt bot 9cc9379f46 automatic `grunt dist` 2015-04-13 00:11:22 +00:00
Bootstrap's Grunt bot ff88cf9335 automatic `grunt dist` 2015-04-11 00:02:33 +00:00
Bootstrap's Grunt bot b9fe637ecd automatic `grunt dist` 2015-04-08 18:41:31 +00:00
Bootstrap's Grunt bot 8a9d698daf automatic `grunt dist` 2015-04-08 02:31:50 +00:00
Chris Rebert bf3a64f2df grunt dist docs 
[skip sauce]
 2015-04-07 19:18:35 -07:00
Bootstrap's Grunt bot 7c3034dfb0 automatic `grunt dist` 2015-04-07 01:30:48 +00:00
Bootstrap's Grunt bot f62c014cbc automatic `grunt dist` 2015-04-05 07:10:30 +00:00
Bootstrap's Grunt bot e2d5e084b2 automatic `grunt dist` 2015-04-05 07:01:05 +00:00
Bootstrap's Grunt bot 9c41aee780 automatic `grunt dist` 2015-04-05 06:50:29 +00:00
Bootstrap's Grunt bot a250673afc automatic `grunt dist` 2015-04-04 08:40:29 +00:00
Mark Otto 6749e5509c rewrite table modifiers to use .table- prefix 2015-03-30 18:08:01 -07:00
Mark Otto 6a2d456719 grunt dist and docs 2015-03-29 00:14:02 -07:00
Bootstrap's Grunt bot bb6af65ca6 automatic `grunt dist` 2015-03-29 06:40:29 +00:00
Mark Otto ce75f289f2 grunt 2015-03-28 23:33:11 -07:00
Bootstrap's Grunt bot a922985788 automatic `grunt dist` 2015-03-29 04:10:35 +00:00
Bootstrap's Grunt bot e260661ab8 automatic `grunt dist` 2015-03-29 04:00:36 +00:00
Bootstrap's Grunt bot 93bf800e1f automatic `grunt dist` 2015-03-28 00:50:33 +00:00
Bootstrap's Grunt bot 0fa643a8a3 automatic `grunt dist` 2015-03-27 08:50:27 +00:00
Bootstrap's Grunt bot 5833d079a0 automatic `grunt dist` 2015-03-26 05:40:28 +00:00
Bootstrap's Grunt bot 087c68bd85 automatic `grunt dist` 2015-03-26 05:10:31 +00:00
Bootstrap's Grunt bot 39a05d7420 automatic `grunt dist` 2015-03-26 05:00:30 +00:00
Bootstrap's Grunt bot b6508f5d04 automatic `grunt dist` 2015-03-26 01:50:28 +00:00
Bootstrap's Grunt bot e22a73fd38 automatic `grunt dist` 2015-03-21 23:10:30 +00:00
Bootstrap's Grunt bot eece194763 automatic `grunt dist` 2015-03-19 05:30:30 +00:00
Bootstrap's Grunt bot f5250d0a0e automatic `grunt dist` 2015-03-16 15:50:28 +00:00
Chris Rebert a10eb60bc0 full grunt 2015-03-16 08:44:41 -07:00
Bootstrap's Grunt bot 026e7ccf4e automatic `grunt dist` 2015-03-15 21:50:31 +00:00
Bootstrap's Grunt bot fc99118179 automatic `grunt dist` 2015-03-15 11:30:30 +00:00
XhmikosR d18a043ddc Run `grunt`. 2015-03-15 04:27:44 -07:00
Bootstrap's Grunt bot ba1345f144 automatic `grunt dist` 2015-03-10 20:20:23 +00:00
Bootstrap's Grunt bot 9d0259d8d1 automatic `grunt dist` 2015-03-10 18:50:26 +00:00
Mark Otto 01d1090ed2 grunt action 2015-03-09 14:08:20 +00:00
Mark Otto 8d6c89ec3d nuke those for now 2015-03-09 14:08:13 +00:00
XhmikosR ea3c7028bd Run `grunt`. 2015-03-02 11:16:06 +02: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
XhmikosR 05b444aee3 Run `grunt`. 2015-02-26 11:30:23 +02:00
XhmikosR e6dbaea97e Run `grunt`. 2015-02-20 11:35:45 +02:00
fat 1e9e3316b6 kill affix 2015-02-11 11:40:57 -08:00
XhmikosR 81115cd089 Run `grunt`. 2015-02-10 10:50:57 +02:00
XhmikosR 8fd5718e71 Run `grunt`. 2015-01-30 15:13:24 +02:00
Mark Otto a3890a72cf Merge branch 'master' into move-inline-css 
Conflicts:
	docs/assets/css/docs.min.css
 2015-01-21 20:16:08 -08:00
Mark Otto 84e41378e6 style changes 2015-01-21 19:20:16 -08:00
Mark Otto b801ad2a58 testing out svgs 2015-01-21 12:01:36 -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
Mark Otto fa47de717e grunt 2015-01-19 08:33:33 -08:00
Mark Otto c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Mark Otto 4ed95f5fa2 fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome 2015-01-18 15:03:14 -08:00
Mark Otto db8eeaa17a Fixes #15142: Add position: relative; to .dropup for proper placement of menus 2015-01-18 13:39:40 -08:00
Mark Otto 1bf1ba7103 Merge branch 'master' into pr/15278 
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
 2015-01-18 12:24:29 -08:00
Mark Otto 22b79dae3c grunt 2015-01-18 12:22:43 -08:00
Mark Otto d4f1331e51 grunt 2015-01-15 15:51:02 -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 0e5d17d5f6 Merge branch 'master' into v4 
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
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	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/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.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/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.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/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	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/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.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
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
 2015-01-03 20:08:58 -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 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
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
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 8ba213c9aa grunt 2014-12-11 13:54:24 -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
XhmikosR 4e27c48248 Run `grunt`. 2014-12-11 08:24:31 +02: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 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 57071cc68a grunt--fuuuuuuuuuuuuuck you line comments 2014-12-05 14:56:29 -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