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

7172 Commits

Author SHA1 Message Date
Mark Otto
03501f9c4a Merge branch 'master' into docs_derp 2013-11-16 22:02:59 -08:00
Mark Otto
ae4d5f21a9 fixes #11449: use menlo over monaco 2013-11-16 18:01:59 -08:00
Mark Otto
a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
Mark Otto
86678e6602 text size 2013-11-16 16:50:47 -08:00
fat
7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
Chris Rebert
57b59fcfd0 Merge pull request #10353 from rwillrich/ignore-files
Bower: Ignore development and documentation files on bower.json. Fix #10313
2013-11-14 15:37:22 -08:00
Julian Thilo
27b62d39e2 Merge pull request #11476 from ZDroid/keyframes
Remove unusual keyframes prefixes
2013-11-14 01:14:06 -08:00
Zlatan Vasović
c2a6e950d7 Remove unusual keyframes prefixes 2013-11-13 22:32:46 +01:00
Chris Rebert
4cbc8d49b1 Justified Nav rendering bug fixed in Chrome as of v31.0.1650.48 2013-11-13 12:03:03 -08:00
Chris Rebert
c1c2a8e188 Merge pull request #11385 from twbs/justified-nav-example-warning
add warning about WebKit bug to the justified nav example itself
2013-11-11 14:44:40 -08:00
Chris Rebert
e7d6af003e Merge pull request #11376 from twbs/double-click-radio-fix
Double-clicking on a .btn-ized radio button shouldn't de-select it
2013-11-10 17:33:12 -08:00
Chris Rebert
7a3f41b11b <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt 2013-11-10 17:25:17 -08:00
Brian Leonard
5d6e9212a6 Don't deselect radio buttons in data-toggle; fixes #9920
Merges #10787
2013-11-10 17:23:11 -08:00
Nathan Muir
934d1bcae5 Add unit test for #9920
Merges #10385
2013-11-10 17:23:11 -08:00
Chris Rebert
a639c6e1cf Merge pull request #11409 from twbs/add-release-checklist
add release checklist to CONTRIBUTING file
2013-11-10 17:17:15 -08:00
Chris Rebert
ce0d008bc3 add release checklist to CONTRIBUTING file; fixes #11290 2013-11-10 17:16:21 -08:00
Chris Rebert
463343af63 more nesting in table.less 2013-11-06 18:38:27 -08:00
Chris Rebert
798e64cebf use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 2013-11-06 18:33:07 -08:00
Chris Rebert
ceefbce100 add warning about WebKit bug to the justified nav example itself 2013-11-06 15:21:07 -08:00
Mark Otto
6df6723c15 Merge branch 'master' into docs_derp
Conflicts:
	dist/css/bootstrap.min.css
2013-11-06 14:04:54 -08:00
Chris Rebert
3887f540b9 update remaining version numbers 2013-11-06 13:19:18 -08:00
Mark Otto
eaff6bc49a grunt 2013-11-06 13:10:51 -08:00
Mark Otto
98acdaeb00 bump links to 3.0.2; change readme download to release URL format 2013-11-06 13:09:35 -08:00
Mark Otto
88a06640dd Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) 2013-11-06 13:03:08 -08:00
Mark Otto
d1048a7837 run grunt after version bumps 2013-11-06 13:02:15 -08:00
Mark Otto
6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Mark Otto
b593df1830 docs derp 2013-11-06 11:00:39 -08:00
Chris Rebert
c84d96ac1f fix #11378 2013-11-06 10:30:39 -08:00
Chris Rebert
375b9edb41 Merge pull request #11273 from benji07/patch-1
Add a branch alias
2013-11-05 23:36:48 -08:00
Benjamin Lévêque
7df3e142ac Add a branch alias
Add a branch alias to be able to require 3.0.* version (use the branch master if minimum-stability is dev or use a tag if it's defined to stable)
2013-11-06 08:25:40 +01:00
Chris Rebert
89d489dfc7 re-grunt 2013-11-05 16:58:18 -08:00
Chris Rebert
f1b0cd491c Merge pull request #10039 from daguej/js-refs
Don't explicitly reference global jQuery
2013-11-05 16:55:55 -08:00
Chris Rebert
d2e710a2df fix 1 remaining instance of #11349 2013-11-05 16:37:54 -08:00
Chris Rebert
a063e1f736 Merge pull request #11349 from alefteris/examples-navbar-sr-only
Add toogle nav for screen readers in examples
2013-11-05 16:35:14 -08:00
Chris Rebert
b6a083e77f Merge pull request #11327 from ZDroid/nestnail
Use nesting for thumbnail styles
2013-11-05 16:20:53 -08:00
Chris Rebert
13b96677ba Merge pull request #11335 from twbs/version-number-updater
add Grunt task to change version numbers
2013-11-04 11:24:32 -08:00
Chris Rebert
0bb122a377 add Grunt task to change version numbers; fixes #11332 2013-11-04 11:22:30 -08:00
Chris Rebert
aeee718247 update node.js to v0.10.x (current stable) 2013-11-04 10:41:10 -08:00
Chris Rebert
de271bf612 Merge pull request #11354 from Ore4444/patch-1
Fixed links
2013-11-04 08:54:37 -08:00
Ore Landau
eae1af1d27 Fixed links
Links to same-page anchors were treated as external links.
2013-11-04 12:33:43 +02:00
Thanos Lefteris
70db224073 Add toogle nav for screen readers in examples 2013-11-03 21:08:24 +02:00
Chris Rebert
df3b44f27a Merge pull request #11345 from pborreli/patch-3
Removed duplicated class change from migration instructions
2013-11-02 20:11:08 -07:00
Pascal Borreli
05c826d67d Removed duplicated class change from migration instructions 2013-11-03 03:08:11 +00:00
Chris Rebert
fcb906ce09 Merge pull request #11336 from twbs/fix-11317
don't use nonstandard window.location.origin in customizer JS
2013-11-02 15:06:16 -07:00
Julian Thilo
88b651012d Fix #7398 in Basic template
See https://github.com/twbs/bootstrap/issues/7398#issuecomment-27617890 for details.
Thanks @martinburger
2013-11-02 13:34:31 +01:00
Julian Thilo
be60ee1377 Merge pull request #11338 from ZDroid/nestform
Use nesting for .placeholder()
2013-11-02 05:27:30 -07:00
Zlatan Vasović
f1bc840d43 Use nesting for .placeholder() 2013-11-02 09:35:51 +01:00
Chris Rebert
db314528eb don't use nonstandard window.location.origin in customizer JS; fixes #11317 2013-11-01 18:56:27 -07:00
Chris Rebert
ea3c89189a Merge pull request #11334 from glebm/patch-2
& > == >
2013-11-01 18:29:45 -07:00
Gleb Mazovetskiy
b75d5f5fc4 & > == > 2013-11-02 02:19:11 +01:00