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

4365 Commits

Author SHA1 Message Date
Mark Otto 3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
Mark Otto 4f8697cbbb grunt 2014-07-02 23:44:56 -07:00
Mark Otto fcf9470a20 typo 2014-07-02 23:35:37 -07:00
Mark Otto 96b545c6b5 Fixes #13989: Don't extend the input sizes; manually chain the selectors 2014-07-02 23:14:23 -07:00
Mark Otto fb37ec16f8 Merge branch 'master' into pr/14005 2014-07-02 22:55:01 -07:00
Mark Otto b4958aba69 merge in and resolve conflicts 2014-07-02 22:54:56 -07:00
Mark Otto a091c90063 fix new form validation 2014-07-02 22:12:39 -07:00
Mark Otto d67fe0f5b9 Merge branch 'pr/14011' 2014-07-02 22:06:32 -07:00
Mark Otto ebdecacd65 fix up examples 2014-07-02 22:06:28 -07:00
Chris Rebert afbe7114b4 clarify the iOS virtual keyboard bug with respect to navbars 2014-07-02 17:09:13 -07:00
Michael Silber 1e407c81f1 Add collapsed default class to navbar-toggle 2014-07-02 16:49:03 -04:00
Zac Echola 1136f9346a Moves checkbox/radios into "Validation states" example. 2014-07-02 11:32:25 -05:00
Zac Echola afdc9c4b32 Documents radio and checkbox validation states 
References #14010

fixing duped IDs

fix ALL the duped IDs.

make example id match actual id
 2014-07-02 11:05:28 -05:00
XhmikosR 2a47034598 Copy all files in docs/dist. 
Now we are on par with what we have on the gh-pages dist/ folder.
 2014-07-01 07:38:38 +03:00
Chris Rebert 8deab3a95d Merge pull request #13988 from twbs/fix-13896 
doc that you can't use both data-ride and $().carousel() on the same carousel
 2014-06-30 14:49:11 -07:00
Chris Rebert bf183e080e fix #13964 2014-06-30 10:27:55 -07:00
XhmikosR 225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
Patrick Robertson dcb09f3b09 Fix inconsistency between demo and displayed code for modal demo 
Fixes #13991
 2014-06-30 19:19:18 +07:00
Chris Rebert 3dfad4f1ad doc that you can't use both data-ride and $().carousel() on the same carousel; fixes #13896 
[skip sauce]
 2014-06-29 21:16:44 -07:00
Chris Rebert 48e35cb830 docs: use valid JSON in compound option value examples 
Fixes #13874.
[skip sauce]
 2014-06-29 21:08:42 -07:00
Chris Rebert d23d9ee4a0 fix #13979 2014-06-29 19:58:09 -07:00
Mark Otto 018114fc09 Merge pull request #13954 from hnrch02/persist-preview-theme 
Save "Preview theme" state; resolves #13940
 2014-06-28 21:43:04 -07:00
Mark Otto 51f924ea24 fixes #13968 2014-06-28 16:23:06 -07:00
XhmikosR fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Heinrich Fenkart 92ca842830 Save "Preview theme" state; resolves #13940 2014-06-27 02:08:58 +02:00
Chris Rebert b9527acc45 JSCS hotfix 
[skip sauce] [skip validator]
 2014-06-26 13:01:21 -07:00
Chris Rebert fde088751a regenerate docs.min.js 
[skip sauce]
 2014-06-26 12:21:45 -07:00
Chris Rebert 2f7d5fd26b docs: minor correction to the focus-triggered popover demo explanation 2014-06-26 12:21:45 -07:00
Chris Rebert 0bc2edd191 add docs JS to activate popover demos; fixes #13937 2014-06-26 12:21:33 -07:00
Rufo Sanchez 1939d017c5 Fixed crazy-making typo on home page 
...at least if you're a writing nerd :P "Bootstrap ships with vanilla CSS, but *its* source code..."
 2014-06-26 15:09:59 -04:00
Mark Otto d79082aac8 Merge pull request #13939 from twbs/tree-shaking 
Remove apparent dead code from docs JS
 2014-06-26 11:46:45 -07:00
XhmikosR 10ea20515c Fix link to compiling info. Fixes #13938. 
[skip sauce]
 2014-06-26 11:37:08 -07:00
Chris Rebert c0b3f18c0c rm apparent dead code from docs JS 
.bs-docs-navbar class doesn't seem to be used anywhere at all
 2014-06-26 10:53:58 -07:00
Chris Rebert 43ecc8726b add comment explaining which demos this JS is for 2014-06-26 10:52:12 -07:00
Chris Rebert 43b7a942bc fix class names in popover live examples in docs 2014-06-26 10:51:07 -07:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto 719ebd8239 grunt 2014-06-26 02:49:21 -07:00
Mark Otto 4dcdc08d89 grunt 2014-06-25 23:03:40 -07:00
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
Bas Bosman 128e52ff29 Fix dismissible spelling 2014-06-18 00:00:28 +02:00
Chris Rebert 5b9e2bf126 popovers.html: fix typo: "Dimissmisable" 2014-06-17 12:57:54 -07:00
Heinrich Fenkart 5e6967358f Update generated markup by the tooltip plugin in docs; fixes #13796 2014-06-12 05:35:27 +02:00
Mark Otto b1a9168b15 grunt dist 2014-06-11 18:13:50 -07:00
Chris Rebert 4949d26a1d tweak #13453 Firefox bug summary 2014-06-11 11:48:43 -07:00
Mark Otto 85935f75cc Fixes #13453: add firefox table-border and tbody bug to wall of bugs 2014-06-11 09:27:07 -07:00
Bas Bosman 7a0f4416a5 Add dropped text-justify 2014-06-11 17:39:02 +02:00
Heinrich Fenkart 03b556bbc5 Follow-up to #13671; improves consistency of text with previous examples 
Also fixes a small indentation error.
 2014-06-11 08:33:30 +02:00
Mark Otto f09d6b7a98 grunt 2014-06-10 23:15:09 -07:00
Mark Otto ed2da1c354 Merge pull request #13351 from Cecchi/nested-kbd 
Add nested kbd element styles for actual keys or inputs
 2014-06-10 23:09:25 -07:00
Chris Rebert cb85f2ad9b fix grammar in new callout 2014-06-10 23:08:30 -07:00
Mark Otto f77d0aa591 fixes #13356: clarify use of clearfix on parents 2014-06-10 23:06:25 -07:00
Mark Otto 5c1357b3e9 grunt 2014-06-10 22:58:21 -07:00
Mark Otto 1d97cbed0f Merge pull request #13671 from 04818419/text-transformation 
text transformation added
 2014-06-10 22:56:38 -07:00
Mark Otto 7bcd78847f grunt 2014-06-10 22:51:17 -07:00
Mark Otto 57bd8f943b grunt 2014-06-10 22:47:25 -07:00
Mark Otto bc38d3b303 words 2014-06-10 22:41:48 -07:00
Mark Otto dacaf619d2 docs callout for #13219 2014-06-10 22:39:27 -07:00
Mark Otto 97e0cd015f homepage copy to fix #13733 2014-06-10 21:47:51 -07:00
Mark Otto 5c6c0a194d fixes #13775: tweak grid nesting docs about # of cols, change up example slightly 2014-06-10 21:24:44 -07:00
Mark Otto dcbe484a09 New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. 2014-06-10 21:20:34 -07:00
Mark Otto e8100c3b3c fix thumbnails docs 2014-06-10 21:14:04 -07:00
Mark Otto 631e04b6fc Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 2014-06-10 20:50:58 -07:00
Mark Otto c0e82accad grunt 2014-06-10 20:17:22 -07:00
Mark Otto 9cdbf0e807 Merge branch 'master' of github.com:twbs/bootstrap 2014-06-10 18:12:29 -07:00
Mark Otto 9a51410fd3 grunt 2014-06-10 18:11:26 -07:00
Chris Rebert ff7e8d5054 button-groups.html: fix grammar: "in on" => "on" 2014-06-10 18:09:30 -07:00
Chris Rebert bbdaf0f244 Merge pull request #13780 from twbs/fx-30 
<input> buttons line-height Firefox bugfix has been shipped!
 2014-06-10 11:52:20 -07:00
Chris Rebert af45472dfe <input> buttons line-height Firefox bugfix has been shipped! 
Remove Wall of Browser Bugs entry.
Update mention of the bug in the CSS docs.
[skip sauce]
 2014-06-10 11:48:12 -07:00
Mark Otto 4aca4cf866 grunt for table change 2014-06-10 00:26:20 -07:00
Mark Otto e06970948b Fixes #13616: Add custom gutter support to containers 2014-06-10 00:24:23 -07:00
Mark Otto 82bd8b6dfd twerk copy 2014-06-09 23:29:44 -07:00
XhmikosR 1b8935ee95 Run `grunt dist`. 2014-06-10 08:30:17 +03:00
XhmikosR 89c0e4d2ab Update ZeroClipboard to v1.3.5. 
Also use the official filenames.
 2014-06-10 08:30:17 +03:00
XhmikosR 5057e7c7b8 Remove unused variables and make tests pass. 2014-06-10 08:30:17 +03:00
Mark Otto 7d1365ce1c Refactor and restyle. 2014-06-10 08:30:16 +03:00
soundarapandian 250e021ff1 Integrate ZeroClipboard to easily copy code snippets 2014-06-10 08:30:16 +03:00
Mark Otto 9e1652aa50 grunt 2014-06-09 22:25:24 -07:00
Mark Otto 61dbc6134e Merge branch 'master' of github.com:twbs/bootstrap 2014-06-09 21:56:45 -07:00
Mark Otto 2535f7c79a fixes #13769 2014-06-09 21:45:55 -07:00
Mark Otto d2061e8aeb relative 2014-06-09 21:26:57 -07:00
Mark Otto 24a9b34add typo 2014-06-09 21:08:24 -07:00
Mark Otto b35840e48d simpler and updated docs copy for icon font file paths 2014-06-09 21:00:27 -07:00
XhmikosR 48e2f92aab Fix favicon.ico after d763b0fe5b. 2014-06-09 11:13:24 +03:00
XhmikosR 41b92b967a Run `grunt`. 
[ci skip]
 2014-06-09 11:10:09 +03:00
XhmikosR 8cdc34f6e3 Update filesaver.js to v2014-05-27. 
[ci skip]
 2014-06-09 11:10:08 +03:00
XhmikosR 91bed93d55 Update Blob.js to v2014-05-31. 
[ci skip]
 2014-06-09 11:10:08 +03:00
Mark Otto 1309085d57 change up the padding on bs-docs-header container to alleviate #13682 2014-06-08 23:09:06 -07:00
Mark Otto 8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
Mark Otto 85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
XhmikosR e1f9c25f8d Losslessly compress apple-touch-icon-precomposed.png. 2014-06-09 01:15:08 +03:00
Mark Otto d763b0fe5b new icons 2014-06-09 01:15:08 +03:00
XhmikosR 29d00e0cd7 Move apple-touch-icon-precomposed.png and favicon.ico in docs root. 
This way, it works in all browsers.
 2014-06-09 01:14:44 +03:00
XhmikosR 79cbf5501e Use a 152x152 apple touch icon. 2014-06-09 01:14:44 +03:00
XhmikosR 9884a3d775 Re-create favicon.ico from the new SVG image. 2014-06-09 01:14:44 +03:00
Mark Otto 5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto d1872b4c98 Merge branch 'master' into pr/13736 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-06-08 13:57:44 -07:00
Mark Otto 5cd72ce230 grunt 2014-06-08 13:55:40 -07:00
Mark Otto 88068e93fa Merge branch 'master' of github.com:twbs/bootstrap 2014-06-08 13:28:56 -07:00
Mark Otto d1cf27bd03 fix nested containers (addresses some of #13682) 2014-06-08 13:28:45 -07:00
Mark Otto 34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto 1e3b93804f grunt 2014-06-08 11:18:59 -07:00