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

9551 Commits

Author SHA1 Message Date
Chris Rebert
d9f356f05f use non-minified BS Theme CSS on non-gh-pages 2014-07-03 13:06:54 -07:00
Chris Rebert
6b46d4d8c1 use non-minified Bootstrap CSS on non-gh-pages 2014-07-03 13:05:48 -07:00
Chris Rebert
456bd67da8 Merge pull request #13986 from twbs/address-13874
docs: use valid JSON in compound option value examples
2014-07-03 11:07:50 -07:00
Chris Rebert
9875ce8d63 Merge pull request #13998 from steelywing/patch-1 2014-07-03 10:52:42 -07:00
Wing
4b08832308 no need to create $.Event
`trigger()` can handle string argument
2014-07-03 10:52:22 -07:00
Wing
48b822db40 trigger 'affixed.bs.affix' instead of 'affixed'
Original is triggering `affixed` not `affixed.bs.affix`, only `.on('affixed.bs.affix', ...)` also catch `affixed` event.

Closes #13998.
2014-07-03 10:52:22 -07:00
Mark Otto
13426c18a3 Merge pull request #14030 from BBosman/double-cursor
Remove superfluous cursor:pointer
2014-07-03 09:57:36 -07:00
Bas Bosman
4975978083 Remove superfluous cursor:pointer 2014-07-03 13:17:14 +02:00
Mark Otto
23dd323da1 grunt 2014-07-03 00:57:37 -07:00
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
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
4715e05510 Merge pull request #14001 from twbs/docs-dist
Copy all files in docs/dist.
2014-07-02 11:52:08 +03:00
Boris Serdyuk
77c1a528ab place feedback icon lower, only if it really need 2014-07-01 20:23:22 +04: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
XhmikosR
a013c112c4 Update dependencies. 2014-07-01 07:32:50 +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
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