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

2885 Commits

Author SHA1 Message Date
Mark Otto 169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto b39ce7d6c0 grunt 2015-06-18 15:48:54 -07:00
Julian Thilo a49f8e98f7 Update customize.min.js with version bump 2015-06-16 18:45:08 +02:00
Mark Otto 57a9a5c803 bump version 2015-06-16 09:37:42 -07:00
Mark Otto 16b48259a6 customizer and raw files 2015-06-16 09:13:22 -07:00
Mark Otto 29ff44d311 grunt 2015-06-16 09:06:51 -07:00
Mark Otto e615ae053c overhaul nav and shit again 
- drop the index pages save for examples
- comment out the extend section for now
- fix up spacing fix on team list
 2015-06-13 14:05:25 -07:00
Mark Otto 840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto 07c7d2d1de remove commented out css 2015-06-09 15:24:28 -07:00
Mark Otto 7f37ec1be3 grunt 2015-06-09 15:23:21 -07:00
Mark Otto 6b1c9ee8d5 redo most of the css for the masthead, page headers, and ads 2015-06-09 15:22:57 -07:00
XhmikosR b5ed74d43d Run `grunt`. 
[ci skip]
 2015-06-01 10:29:18 +03:00
XhmikosR 82aa0cd56b docs: update uglify-js to v2.4.23. 
[ci skip]
 2015-06-01 10:29:18 +03:00
Mark Otto c1a84e38c7 grunt 2015-05-31 23:53:14 -07:00
Timothy Gu 7278bed86f Adjust Carbon Ads margin on -xs 
The .container that immediately surrounds .carbonad has a padding of 15px, not 30px.

Fixes #16552.
 2015-05-30 14:57:41 -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 719afd48ac style the markdown toc a bit to hide the first item (the contents heading) 2015-05-29 01:59:20 -07:00
Mark Otto 9e1af0d743 fix scrolling of sidebar 2015-05-28 20:05:48 -07:00
Mark Otto 67f2e77955 don't use anchor.js on h1s in the docs 2015-05-28 14:08:25 -07:00
Mark Otto 7c594f2069 change card styles in docs examples to use just a max-width for now 2015-05-28 14:08:11 -07:00
Mark Otto 663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
 2015-05-27 15:49:55 -07:00
Mark Otto 4238e2057f grunt 2015-05-22 22:34:04 -07:00
Mark Otto e84bc04e20 button alignment in nav 2015-05-22 22:33:58 -07:00
XhmikosR 315907c97c Use `https` when possible. 2015-05-17 12:43:20 +03:00
XhmikosR 9b6a2013d6 docs: update uglify-js to v2.4.21. 
[ci skip]
 2015-05-17 00:55:26 +03:00
XhmikosR c56032a0e5 Remove grunt-banner completely. 
Add a license header in theme instead.
 2015-05-16 12:57:27 +03:00
XhmikosR 9e395712a5 Run `grunt`. 2015-05-16 09:58:16 +03:00
Bryan Braun dec2faec3d Update Anchor.js and port over the existing styles. 
Anchor.js 1.0.0 drops the need to use anchor.css, so we remove it
from the codebase and move any leftover styles over to docs.css.

Closes #16488 by merging it.
 2015-05-16 09:58:15 +03:00
Chris Rebert c111c291be Relicense ie10-viewport-bug-workaround.js under MIT License 
Fixes #16470
Closes #16483
 2015-05-14 22:43:27 -07: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
fat 3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -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
XhmikosR 49c4556354 Comply to the new JSCS rules. 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
Mark Otto 19d8585bfa clean up sidebar styles 2015-04-29 11:42:50 -07:00
XhmikosR 07e76a571d Redo changes needed to hide Copy button. 2015-04-29 08:56:33 +03:00
XhmikosR 438cae9d90 Revert "Update ZeroClipboard and remove Copy buttons when Flash is unavailable" 
This reverts commit 229e888929.

ZeroClipboard v2.x drops IE < 9 support.
 2015-04-29 08:55:29 +03:00
XhmikosR 16a44c208d Fix dab6a4f0e3. 2015-04-29 08:54:32 +03:00
XhmikosR 5ca44f94ac Run `grunt`. 2015-04-28 14:24:37 +03:00
XhmikosR 86400070b5 Bump copyright year. 
[ci skip]
 2015-04-28 11:40:42 +03:00
XhmikosR 3e7ca3bbc8 Minor lint tweaks. 2015-04-28 11:03:37 +03:00
Mark Otto dab6a4f0e3 scope anchorjs to immediate children, fixes #16129 2015-04-27 14:16:27 -07: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
Mark Otto dc835db51c fix progress bar animation button 2015-04-26 07:17:45 -07:00
XhmikosR fa4d7d2bd2 Run `grunt`. 2015-04-26 14:03:35 +03:00