Mark Otto
b7b72cc877
Merge branch 'master' into pr/11614
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-28 11:57:12 -08:00
Mark Otto
56f4cf0316
Fixes #11634 : Add warning to docs to not combine icon classes with other elements
2013-11-28 11:38:28 -08:00
Mark Otto
594d0c700d
grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing
2013-11-28 11:33:00 -08:00
Mark Otto
2abaed9876
Merge pull request #11642 from tlindig/caret_color_fix
...
removed all caret border color settings.
2013-11-28 10:45:11 -08:00
Tobias Lindig
3d5e598e5c
add builded files from dist/
2013-11-28 18:40:15 +01:00
Tobias Lindig
ea78248608
removed all caret border color settings.
2013-11-28 17:41:43 +01:00
Mark Otto
9829c86f7c
run grunt
2013-11-26 15:21:27 -08:00
Chris Rebert
27abfba89f
Merge pull request #11616 from ZDroid/remove-window
...
Remove redundant 'window.'
2013-11-26 09:20:56 -08:00
Zlatan Vasović
630fd1cff6
Remove redundant 'window.'
2013-11-26 08:43:26 +01:00
Jesse Mandel
bff8ba2b79
Fix for Issue #11411
2013-11-25 15:19:11 -08:00
Chris Rebert
fa710fdb09
Merge pull request #11612 from JerryChr/master
...
Removed unnecessary semicolon
2013-11-25 11:54:46 -08:00
Jerri Christiansen
bd44a4b5f3
Removed unnecessary semicolon
2013-11-25 20:41:00 +01:00
Chris Rebert
cad664e863
Merge pull request #11598 from ZDroid/customizer-breaks
...
Fix #11594
2013-11-23 12:17:32 -08:00
Chris Rebert
ebc91077f7
Merge pull request #11599 from westonplatter/explicit_fonts
...
explicitly call out font files
2013-11-23 12:10:33 -08:00
Weston Platter
a42d7ff319
explicitly call out font files
...
Using wildcards to specify fonts causes errors for other
npm modules, EG, https://github.com/blittle/bower-installer/issues/33 .
Additionally, it’s better to lock down files included in a
library.
2013-11-23 12:23:18 -07:00
Zlatan Vasović
dbbd49b4f8
Fix #11594
2013-11-23 18:29:27 +01:00
Chris Rebert
de2ab6453a
Merge pull request #11597 from ZDroid/deps-grunt-recess-kickup
...
Kick up grunt-recess dependency
2013-11-23 09:16:32 -08:00
Zlatan Vasović
4160ff0e44
Kick up grunt-recess dependency
2013-11-23 17:41:31 +01:00
Chris Rebert
4c246c0117
Merge pull request #11534 from twbs/doc-async-modals
...
document that modal show()/hide() return before animation finishes
2013-11-21 15:40:12 -08:00
Chris Rebert
ccd564650a
add more missing role="form"-s
2013-11-21 12:02:54 -08:00
Chris Rebert
b34292ce82
Merge pull request #11567 from neilhem/master
...
add role form for horizontal form example
2013-11-21 11:49:24 -08:00
Chris Rebert
7ab6c2743b
Merge pull request #11578 from barraponto/patch-1
...
Make it clear there's a nested media element in the first example
2013-11-21 11:05:45 -08:00
Capi Etheriel
d873af8662
Make it clear there's a nested media element in the first example
2013-11-21 15:13:05 -02:00
Rakhat Jabagin
bf62a6241a
add role form for horizontal form example
2013-11-21 12:04:48 +06:00
Chris Rebert
6ed5a844a8
Merge pull request #11172 from yokomizor/git_ignore_bower_components
...
added bower_components to .gitignore
2013-11-19 14:15:09 -08:00
Chris Rebert
afbdc21def
fixes part of #11117 : doc that modal show()/hide() return before animation finishes
2013-11-18 19:59:09 -08:00
Chris Rebert
2172e2ea8a
fix #11089 : document modal show+shown events' relatedTarget property
2013-11-18 19:29:08 -08:00
Chris Rebert
446f2325a6
add explanatory comment Re: #11526
2013-11-18 14:22:17 -08:00
Julian Thilo
84a3aa3e0c
Merge pull request #11514 from twbs/navbar-text-float-breakpoint
...
Fix #11513 : Don't always float navbar-text
2013-11-18 14:02:17 -08:00
Mark Otto
7c9b93254b
Merge pull request #11526 from erikflowers/firefox-placeholder-fix
...
Firefox placeholder text is faded out and not the full color.
2013-11-18 13:42:52 -08:00
Erik Flowers
50578dda60
- Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color
...
- (this is a re-commit since I messed up my branch last time and failed the travis build)
2013-11-18 11:58:14 -07:00
Chris Rebert
ee1c53dca0
Merge pull request #11521 from valera-rozuvan/patch-1
...
Update dropdown.js
2013-11-18 01:57:56 -08:00
Valera Rozuvan
ad86d9a51b
Update dropdown.js
2013-11-18 11:55:33 +02:00
Julian Thilo
8aec527614
Run grunt dist
2013-11-17 23:45:42 +01:00
Julian Thilo
cdb243706e
Fix #11513 : Don't always float navbar-text
...
`navbar-text` should only float when the navbar is expanded on larger
screens, otherwise the element might be (hidden) behind `navbar-nav`.
Fixes #11513 .
X-Ref: #8820 #8815
2013-11-17 23:07:28 +01:00
Chris Rebert
6b547b357a
Merge pull request #11509 from ZDroid/fix-indents
...
Fix some weird indents
2013-11-17 02:02:00 -08:00
Zlatan Vasović
9a8a571ad1
Fix some weird indents
2013-11-17 10:24:31 +01: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
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
