root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9,489 Commits 108 Branches 92 Tags 662 MiB
Commit Graph

4225 Commits

Author SHA1 Message Date
Mark Otto b6e52d55ea Merge pull request #13905 from Jimtrim/patch-1 
Update cover.css
 2014-06-25 22:29:02 -07:00
Chris Rebert 5fb1c065eb Mozilla bug says the fix targeted v31 2014-06-25 18:04:49 -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
Jacob b31c35b636 Merge pull request #13904 from twbs/revert-umd 
Revert UMD for now, due to #13812.
 2014-06-23 22:54:44 -07:00
Julian Thilo 25b06d927f grid class inconsistency 2 
32bde78e19
 2014-06-23 23:36:18 +02:00
Jim Frode Hoff 29d97d07ef Update cover.css 
Moved the inset box-shadow to .site-wrapper in order to keep the shadow at the edges even if content exceeds viewport and needs scrolling.
 2014-06-23 22:50:38 +02:00
Chris Rebert c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
Mark Otto bc895a4b43 Merge pull request #13900 from twbs/customize_on_your_own 
Remove broken link
 2014-06-23 10:42:13 -07:00
Mark Otto 32bde78e19 grid class inconsistency /cc @juthilo 2014-06-23 10:41:45 -07:00
Mark Otto e033c5be29 Merge branch 'master' of github.com:twbs/bootstrap 2014-06-23 10:39:08 -07:00
Mark Otto df7cfe8652 Fixes #13903: Restore side padding on .btn-block 2014-06-23 10:38:45 -07:00
Ilya Radchenko d4ce4dbf12 fix typo in css - buttons 2014-06-23 12:25:14 -04:00
Julian Thilo 7339759fd6 Remove broken link to Customizing Bootstrap 2014-06-23 17:51:02 +02:00
Mark Otto ca54cff4ab new homepage expo features 2014-06-22 18:04:19 -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 34248437c3 tweak alert per #13875 2014-06-19 19:54:25 -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 166b66d08a formatting 2014-06-19 18:15:42 -07:00
Mark Otto 8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto 1482947405 grunt 2014-06-19 15:25:50 -07:00
Mark Otto a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
Mark Otto 00cc166671 ids over names 2014-06-19 15:22:49 -07:00
Chris Rebert 9488bd58f9 Merge pull request #13867 from hnrch02/remove-depreacted-jscs-rules 
Remove deprecated JSCS rules
 2014-06-19 14:51:52 -07:00
Heinrich Fenkart 587451ad9a Update a few source files to comply to new JSCS rules 2014-06-19 21:08:05 +02:00
Bas Bosman 8c1160d91b Document IE8 font-face weirdness 2014-06-19 16:07:18 +02:00
Chris Rebert d37b0ffa5f Merge pull request #13870 from BBosman/gray-light 
Fix @gray-light in docs
 2014-06-19 06:35:32 -07:00
Bas Bosman 91d2cf848b Fix @gray-light in docs 2014-06-19 14:56:43 +02:00
XhmikosR abe7afd87a Run `grunt`. 2014-06-19 12:58:34 +03:00
XhmikosR 0418c7678d Update JSZip to v2.3.0. 2014-06-19 12:03:10 +03:00
Mark Otto bd541083f1 Nuke equal height columns example; got a few bugs that make it not ready for prime time in v3.2 2014-06-19 02:02:23 -07:00
Mark Otto 162a27f67a grunt 2014-06-18 23:50:16 -07: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 d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto 74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto 02642350f8 Fixes #13400, #13415: actually document the existing practice for links in panel headings 2014-06-18 22:16:15 -07:00
Mark Otto 508d9f0d65 fix part of #13111: hide the docs nav on small and below devices 2014-06-18 19:18:02 -07:00
Mark Otto 11cf54f9df grunt 2014-06-18 18:22:11 -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
Mark Otto cde13fbe11 Merge pull request #13854 from ssorallen/gray-light-higher-contrast 
Darken @gray-light to meet accessibility guidelines
 2014-06-18 15:45:57 -07:00
Chris Rebert d75506fbec among supported WebKit/Blink browsers, this now only applies to Safari 
Missed this in 4cbc8d49b1
 2014-06-18 15:12:17 -07:00
Ross Allen 8c403dc1dc Darken @gray-light to meet accessibility guidelines 
`@gray-light` darkens from #999 to #777, which puts `.text-muted` at the
threshold for the 4.5:1 WCAG minimum contrast[1]. #777:#fff is 4.48:1.

The “Example” headers in docs become #959595, which is contrast ratio
3:1, the minimum for larger text. Since the headers are less important
than the surrounding text, 3:1 is fine and an improvement on the
previous #bbb:#fff (1.92:1).

Fixes issue #13847.

[1] http://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html
 2014-06-18 14:47:14 -07:00
XhmikosR 6d45f733e5 Run `grunt`. 2014-06-18 13:16:32 +03:00
Chris Rebert f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Chris Rebert 8bee6549ad grunt dist 2014-06-17 18:23:14 -07:00