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

364 Commits

Author SHA1 Message Date
Mark Otto
c15aa36798 switch to max-width on containers 2014-10-27 03:07:34 -07:00
Mark Otto
252583b661 grunt 2014-10-26 23:07:20 -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
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
Heinrich Fenkart
e9d6f256c2 grunt 2014-10-26 01:59:25 +02:00
XhmikosR
db550a9235 Run grunt. 2014-10-25 14:12:21 +03:00
Nicole Sullivan
919b4ccb15 Fixes #14799: Add vertical alignment of image in media component
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
2014-10-23 18:48:18 -04:00
Heinrich Fenkart
51f1f58be8 grunt 2014-10-23 06:39:51 +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
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
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
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
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
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
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
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