0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

9584 Commits

Author SHA1 Message Date
XhmikosR
a013c112c4 Update dependencies. 2014-07-01 07:32:50 +03:00
Heinrich Fenkart
91f329e448 Only close modal if escape was hit with keydown; fixes #13929 2014-07-01 05:50:31 +02:00
Heinrich Fenkart
121bf6633e Use mousedown instead of click for backdrop click detection; fixes #13816 2014-07-01 02:53:57 +02: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
Mark Otto
2ff0e5efa2 Merge pull request #13993 from twbs/fix-13964
Fix #13964
2014-06-30 11:39:37 -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
Julian Thilo
a13f645d20 Merge pull request #13992 from pjrobertson/master
Fix inconsistency between demo and displayed code for modal demo
2014-06-30 17:10:57 +02: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
XhmikosR
1098453f83 Update to Jekyll 2.1.x. 2014-06-29 08:39:40 +03: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
Mark Otto
2b6f00c2a7 Merge pull request #13931 from ByScripts/patch-1
Remove "pointer" cursor on disabled list-group-item
2014-06-26 14:47:44 -07:00
Chris Rebert
b9527acc45 JSCS hotfix
[skip sauce] [skip validator]
2014-06-26 13:01:21 -07:00
Chris Rebert
ed8a64c5d8 Merge pull request #13947 from twbs/fix-13937
Fix popover live demos in docs
2014-06-26 12:25:05 -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
Chris Rebert
83d9165287 Merge pull request #13946 from rufo/patch-1
Fixed apostrophe typo on home page
2014-06-26 12:12:37 -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
Chris Rebert
248af0e293 Merge pull request #13942 from twbs/docs-grunt-13938
Fix link to compiling info.
2014-06-26 11:38:41 -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
c068162161 maxcdn urls 2014-06-26 09:36:48 -07:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Thierry Goettelmann
165c7889bd Change cursor from "default" to "not-allowed" if disabled 2014-06-26 16:31:37 +02:00
Thierry Goettelmann
76ca3677f5 Remove "pointer" cursor on disabled list-group-item 2014-06-26 15:50:20 +02:00
Mark Otto
1de2f68bdc Merge branch 'master' of github.com:twbs/bootstrap 2014-06-26 02:49:35 -07:00
Mark Otto
719ebd8239 grunt 2014-06-26 02:49:21 -07:00
Mark Otto
0e5ec1ab7a Merge pull request #13574 from twbs/reinstate-13470
Delete redundant Grunt info in README (Merge before shipping)
2014-06-26 00:06:02 -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
Thomas Coleman
fdacff2297 Fixed @gray-base value being once space short 2014-06-25 16:09:57 +01:00
Thomas Coleman
41f27fd813 Added @gray-base variable to make @gray-{shade} reference, also allows @gray-base to be modified with less#modifyVars and the vars to cascade 2014-06-25 15:00:41 +01:00
Andrei Railean
ac67bc857f removing redundant background declarations on TDs 2014-06-25 15:16:25 +10:00
Andrei Railean
71974e2f4d assign background to row of .table-striped
if background is not set on row, striping doesn't work properly in responsive tables where row and cells are set to  display: block.
2014-06-25 14:01:34 +10:00
XhmikosR
4abb095783 Run grunt.
Revert a991cd572c.
2014-06-25 02:07:17 +03:00
XhmikosR
b93b7b1b6d Revert "Revert "Turn off clean-css' advanced optimizations.""
This reverts commit e31c2edf88.
2014-06-25 01:53:10 +03:00
Chris Rebert
a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00