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

9890 Commits

Author SHA1 Message Date
Chris Rebert
d38fd028d6 Merge pull request #14290 from michaeljayt/patch-1
grunt now watch files in all folders/subfolders
2014-07-30 20:07:27 -07:00
Michael J.
0c03d0c273 grunt now watch files in all folders/subfolders 2014-07-31 10:21:56 +08:00
Chris Rebert
fc1db2e74b Merge pull request #14264 from hnrch02/document-placement-args
Document arguments passed to `placement` function of tooltip/popover
2014-07-28 17:47:51 -07:00
Heinrich Fenkart
852d0d1144 Document arguments passed to placement function of tooltip/popover
Closes #14255
2014-07-29 02:29:41 +02:00
Chris Rebert
86d698f4e4 Merge pull request #14256 from twbs/fix-14224
Correctly doc args passed to function vals for `title` & `content` options of tooltips+popovers
2014-07-28 13:53:48 -07:00
Chris Rebert
2973103571 Merge pull request #14257 from twbs/fix-14219
Document that empty tooltips+popovers do not get displayed
2014-07-28 13:51:51 -07:00
Chris Rebert
5892273a23 Merge pull request #14258 from twbs/fix-14164
Move Windows Phone 8 IE10 viewport bug workaround script from head to footer
2014-07-27 17:08:27 -07:00
Chris Rebert
a64f2008da Merge pull request #14235 from twbs/doc-14221
Update docs & add example for #14221
2014-07-27 17:06:48 -07:00
Chris Rebert
9742bb2ee4 Fix #14164: move Windows Phone 8 IE10 viewport bug workaround script to footer of pages 2014-07-27 17:01:34 -07:00
Chris Rebert
90424296eb Fix #14219: Document that empty tooltips+popovers do not get displayed 2014-07-27 16:51:07 -07:00
Chris Rebert
ff12a76e5a Fix #14224: Correctly document args passed to function vals for title & content options of tooltips+popovers 2014-07-27 16:18:59 -07:00
Mark Otto
d6d9bb5bc8 Fixes #14213: Rouge 1.6.1 2014-07-27 09:35:16 -07:00
Chris Hynes
531fc80885 Use .end() to remove extra line 2014-07-25 11:10:46 -07:00
Chris Rebert
c2f4e5fef1 re-alphabetize .jscsrc 2014-07-25 11:02:30 -07:00
Chris Hynes
519a087dbe Remove popover content with .children().detach() instead of .empty() so it can be reused 2014-07-25 10:16:44 -07:00
Chris Rebert
f023ddc64e Merge pull request #14239 from artbelov/patch-1
Delete duplicate property in .JSCSRC
2014-07-25 07:44:06 -07:00
Chris Rebert
73540abc80 Merge pull request #14240 from vsn4ik/fix_dropdown_link_example
dropdowns.html: Remove wrong "type" attribute.
2014-07-25 07:27:49 -07:00
vsn4ik
3e15e40ac9 dropdowns.html: Remove wrong "type" attribute. 2014-07-25 16:54:05 +04:00
Artem Belov
098242afd8 Delete duplicate JSCS properties 2014-07-25 15:03:07 +04:00
Chris Rebert
2c4641855d fix #14115
[skip sauce]
2014-07-24 15:16:08 -07:00
Chris Rebert
43fe197da7 Update docs & add example for #14221
[skip sauce]
2014-07-24 13:58:13 -07:00
Chris Rebert
5ea6b57616 Merge pull request #14233 from twbs/another-one-bites-the-dust
Remove #9226 from Wall of Browser Bugs
2014-07-24 12:25:42 -07:00
Chris Rebert
8288cc9c05 Remove #9226 from Wall of Browser Bugs
Per https://code.google.com/p/chromium/issues/detail?id=272750
and https://github.com/twbs/bootstrap/issues/9226#issuecomment-49873472
2014-07-24 12:22:22 -07:00
Mark Otto
98d693ba7b Fixes #14142: Adding horizontal padding to captions in tables in panels. 2014-07-23 21:03:46 -07:00
Mark Otto
7fcc6c7889 unfuck those dropdowns 2014-07-23 21:00:48 -07:00
Mark Otto
078aafe7fd Fixes #14221: Make .form-control-static work in inline forms as well 2014-07-23 20:54:07 -07:00
Mark Otto
abbb4d64e1 Merge branch 'master' of github.com:twbs/bootstrap 2014-07-23 20:50:00 -07:00
Mark Otto
6dde491ddf Fixes #14168: bold nested kbd elements 2014-07-23 20:49:47 -07:00
Mark Otto
463fe476d8 Merge pull request #14166 from hnrch02/docs-cleanup
Docs cleanup
2014-07-23 20:39:40 -07:00
Mark Otto
5713bd74d6 Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ 2014-07-23 20:32:05 -07:00
Chris Rebert
912c4bcbe4 Merge pull request #14225 from twbs/issue-14211
Add Wall of Browser Bugs entry for IE bug from issue #14211
2014-07-23 18:02:58 -07:00
Chris Rebert
c0eddc1fe3 Merge pull request #14188 from twbs/doc-14148
Document limitations of buttons JS plugin
2014-07-23 18:01:31 -07:00
Chris Rebert
4a98e2d765 Merge pull request #14191 from twbs/autocomplete-off-btns
Use autocomplete="off" in buttons plugin docs examples
2014-07-23 17:55:12 -07:00
Chris Rebert
c22ec79d3f Add Wall of Browser Bugs entry for IE bug from issue #14211
[skip sauce]
2014-07-23 10:24:23 -07:00
Jacob
36483af92c Merge pull request #14207 from twbs/charlesbjohnson-affix-bottom-when-dynamic-height
Charlesbjohnson affix bottom when dynamic height
2014-07-21 22:48:38 -07:00
Jacob
f88e6ba2a3 Merge pull request #14208 from twbs/mckramer-dropdown-aria
Mckramer dropdown aria
2014-07-21 22:48:08 -07:00
fat
4775c9296a Merge branch 'dropdown-aria' of git://github.com/mckramer/bootstrap into mckramer-dropdown-aria
Conflicts:
	docs/_includes/js/dropdowns.html
2014-07-21 22:44:35 -07:00
fat
eff9b063da cleanup style 2014-07-21 22:37:04 -07:00
XhmikosR
97cb2803d7 Run grunt. 2014-07-22 08:31:36 +03:00
XhmikosR
88b4016ce6 Update all devDependencies. 2014-07-22 08:31:26 +03:00
XhmikosR
caed585033 Update Filesaver.js to v2014-07-21. 2014-07-22 08:29:06 +03:00
XhmikosR
5c569dc4d4 Update Blob.js to the latest version. 2014-07-22 08:29:06 +03:00
XhmikosR
8b6d396adf Merge pull request #13873 from twbs/grunt-csscomb
Update grunt-csscomb
2014-07-22 08:26:37 +03:00
XhmikosR
8d435cbb3c Run grunt. 2014-07-22 08:25:41 +03:00
XhmikosR
7ba5c5d5e4 Update grunt-csscomb. 2014-07-22 08:25:35 +03:00
Chris Rebert
e3f4072a9e update to Jekyll v2.1.1 in Travis CI build 2014-07-21 19:38:30 -07:00
Chris Rebert
031734c1d1 update to rouge v1.5.1 in Travis CI build 2014-07-21 19:37:22 -07:00
Mark Otto
a3ebd0104c Merge pull request #14203 from twbs/fix-14202
Document that form field feedback icons only work with input.form-control
2014-07-21 12:46:10 -07:00
Chris Rebert
1118e8103b Document that form field feedback icons only work with input.form-control
Closes #14202.

[skip sauce]
2014-07-21 12:27:55 -07:00
Chris Rebert
49519e9816 grunt dist 2014-07-21 00:35:41 -07:00