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

12423 Commits

Author SHA1 Message Date
Mark Otto
c5babda02f Merge pull request #16215 from zacechola/list_group_buttons
Adds button styles to `.list-group-item`
2015-05-13 21:35:39 -07:00
Mark Otto
82279a8eb2 Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders 2015-05-13 21:20:02 -07:00
Mark Otto
f2adfeb62d Merge pull request #16405 from rlindner81/Fix16371
Fixes Issue #16371 Carousel control is vertically off center
2015-05-13 20:48:07 -07:00
Mark Otto
fdebec3957 Merge pull request #16462 from kkirsche/patch-12
[Closes #16460] Fix .pagination-sm line height
2015-05-13 20:38:48 -07:00
Mark Otto
504c90da96 Merge pull request #16457 from kkirsche/patch-8
[Closes #16447] Manually add license to bootstrap.less
2015-05-13 20:37:38 -07:00
fat
dbaffd43c0 Merge pull request #116 from twbs/fat-es6Alert
es6 - wip
2015-05-13 15:01:39 -07:00
fat
6b2b0ed32f al tests passing, dist rebuilt, w/typechecker 2015-05-13 14:52:46 -07:00
fat
eaab1def7a add simple type checker implementation 2015-05-13 14:46:50 -07:00
vsn4ik
ad6933cfe6 Remove unnecessary style=flat from bages
[skip validator]
[skip sauce]
2015-05-13 23:55:15 +03:00
fat
c2ced2292a fix up tests 2015-05-13 13:46:08 -07:00
fat
b0d142334f fix #15301 2015-05-13 13:43:56 -07:00
Kevin Kirsche
5907347382 [Closes #16460] Fix .pagination-sm line height
[Closes #16460] Fix .pagination-sm line height by adding `@line-height-small` to `.pagingation-sm`.
2015-05-13 16:30:40 -04:00
fat
7ef0e52fd0 add "focus" option for turning off modal focusing #16050 2015-05-13 13:22:26 -07:00
fat
da495ee24c address https://github.com/twbs/bootstrap/pull/16135 2015-05-13 13:15:11 -07:00
fat
f8b2569ec8 implement global dispose method 2015-05-13 12:48:34 -07:00
fat
dafdd180cd add umd module support in dist 2015-05-13 10:13:34 -07:00
fat
6b251582d6 update attachment -> placement 2015-05-12 16:54:21 -07:00
fat
ab1578465a grunt test-js, grunt dist-js now working 2015-05-12 16:52:54 -07:00
fat
a58febf71a popover passing as well 2015-05-12 14:35:00 -07:00
fat
3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -07:00
Kevin Kirsche
25dcaf4f23 [Closes #16447] Concat. license to bootstrap.less
[Closes #16447] Concat. license to bootstrap.less
2015-05-11 23:55:32 -04:00
fat
8eee78ca15 tab es6 2015-05-11 12:29:06 -07:00
fat
2d91494d96 scrollspy es6 2015-05-11 12:05:35 -07:00
fat
ca9c850ebb add getters for Version and Default where applicable
add modal my gawd
2015-05-10 19:45:38 -07:00
fat
bbb97a8660 add dropdown 2015-05-10 13:47:11 -07:00
fat
8bab38bb71 add collapse 2015-05-09 23:04:58 -07:00
XhmikosR
9bf6e107e3 Update dependencies. 2015-05-10 01:22:23 +03:00
XhmikosR
1eba173c9e Update jQuery to v1.11.3. 2015-05-10 01:22:23 +03:00
Chris Rebert
2084791511 Merge pull request #16445 from twbs/enter-email
docs examples: input[placeholder]: "Enter email" => "Email"
2015-05-08 00:58:40 -07:00
Chris Rebert
843581b8ff docs examples: input[placeholder]: "Enter email" => "Email"
For uniformity, as we don't seem to use this "Enter <X>" phrasing anywhere else.

[skip sauce]
2015-05-08 00:24:39 -07:00
fat
1b183e2ff7 carousel -> es6 2015-05-07 22:26:40 -07:00
fat
6605051882 button -> es6 2015-05-07 17:14:38 -07:00
fat
c3a79b1a8c change the export pattern to protect against leaking globals 2015-05-07 16:34:28 -07:00
fat
0724bd91ff es6 alert :| 2015-05-07 12:57:31 -07:00
fat
06b1d49808 Merge pull request #115 from twbs/fat-revertJS
remove closureness from plugins
2015-05-06 13:45:48 -07:00
Julian Thilo
a3c480fd94 Closes #16249: Doc that nested tabs are not supported 2015-05-06 22:37:56 +02:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
Chris Rebert
ee33891e42 Merge pull request #60 from twbs/libsass-185
Remove libsass @media nesting bug workaround
2015-05-06 13:29:02 -07:00
Chris Rebert
09fb80568a Merge pull request #114 from twbs/grunt-sass-1
Bump grunt-sass to ^1.0.0
2015-05-06 13:17:17 -07:00
Chris Rebert
1e85e0f891 Bump grunt-sass to ^1.0.0 2015-05-06 13:08:39 -07:00
Chris Rebert
2aa102bfd4 Add Wall of Browser Bugs entries for #16372 (Safari/WebKit) 2015-05-06 11:23:24 -07:00
Chris Rebert
0d2c7ecb7a Add Wall of Browser Bugs entry for #16372 (Chrome)
Closes #16372
2015-05-05 23:21:15 -07:00
Chris Rebert
d9a7cb2a09 Merge pull request #16430 from twbs/stateful-btn
Improvements to stateful button JS docs
2015-05-05 15:38:45 -07:00
Chris Rebert
89f2c5c5c0 Document that $(...).button('reset') is async.
Closes #16362.
[skip sauce]
2015-05-05 15:03:12 -07:00
Chris Rebert
fce30b57e2 Mark stateful button feature as deprecated
Refs https://github.com/twbs/bootstrap/issues/16362#issuecomment-96268469
[skip sauce]
2015-05-05 15:03:05 -07:00
XhmikosR
414d0a535a Run grunt. 2015-05-05 11:57:42 +03:00
XhmikosR
2662593583 Update grunt-banner. 2015-05-05 11:56:27 +03:00
XhmikosR
a2f81ceb57 phantom.js: switch to unicode characters that work on Windows too. 2015-05-05 06:58:54 +03:00
XhmikosR
280f6c5d5c Merge pull request #16392 from twbs/jscs
Update JSCS rules
2015-05-05 06:58:16 +03:00
XhmikosR
5ae00f2e7c Run grunt. 2015-05-05 06:50:18 +03:00