Mark Otto
|
080aa7f5c8
|
Merge branch 'master' into pr/11299
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
|
2013-11-30 00:55:00 -08:00 |
|
Mark Otto
|
819e920d16
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2013-11-30 00:43:27 -08:00 |
|
Mark Otto
|
a7a9dcaeb2
|
Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it
|
2013-11-30 00:42:36 -08:00 |
|
Mark Otto
|
95487f75d1
|
Merge pull request #11329 from ZDroid/patch-1
Add 'in' to complete thought
|
2013-11-30 00:40:32 -08:00 |
|
Mark Otto
|
143427b8ae
|
Merge pull request #11330 from maxwellium/patch-1
fixing offcanvas example for chrome
|
2013-11-30 00:39:00 -08:00 |
|
Mark Otto
|
a15a6dfa96
|
Merge pull request #11369 from ssorallen/speedier-js-loading
Speedier jQuery and Twitter widgets.js
|
2013-11-30 00:32:39 -08:00 |
|
Mark Otto
|
bb4a39d51c
|
Merge branch 'master' into pr/11388
Conflicts:
dist/css/bootstrap.min.css
|
2013-11-30 00:26:53 -08:00 |
|
Mark Otto
|
e6eb798178
|
Merge pull request #11434 from ZDroid/fix-11433
Fix #11433: Better documentation for validation states
|
2013-11-30 00:23:16 -08:00 |
|
Mark Otto
|
938d40fc20
|
Merge pull request #11432 from masterbee/WCAG2-color-contrast
Corrected color contrast to WCAG 2.0 AA (Accessibility Tweak) - Forms and Alerts
|
2013-11-30 00:21:47 -08:00 |
|
Mark Otto
|
a06610a030
|
Merge pull request #11502 from 1000hz/patch-1
Add missing data namespace for dropdown
|
2013-11-29 23:55:43 -08:00 |
|
Mark Otto
|
5b137e5857
|
Merge pull request #11511 from ZDroid/fix-xs-comments
Fix comments for extra small grid
|
2013-11-29 23:46:35 -08:00 |
|
Mark Otto
|
f7b7cc3443
|
Merge pull request #11585 from thriqon/master
Issue #11550 : Easily copyable classes
|
2013-11-29 23:45:35 -08:00 |
|
Mark Otto
|
40f86af16a
|
Merge pull request #11617 from guybedford/master
include jspm package configuration
|
2013-11-29 23:43:01 -08:00 |
|
Mark Otto
|
8674228521
|
Merge branch 'pr/11493'
Conflicts:
dist/css/bootstrap.min.css
|
2013-11-29 23:30:26 -08:00 |
|
Mark Otto
|
9f0da54856
|
grunt to get dist files
|
2013-11-29 23:29:34 -08:00 |
|
Mark Otto
|
e4848286c8
|
Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles
|
2013-11-29 23:19:04 -08:00 |
|
Mark Otto
|
bf9f39270c
|
Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop
|
2013-11-29 22:03:49 -08:00 |
|
Mark Otto
|
36b82c37ec
|
Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies
|
2013-11-29 21:59:28 -08:00 |
|
Mark Otto
|
61c641ea05
|
fixes #10699: use xs grid classes in regular thumbnail docs
|
2013-11-29 21:08:16 -08:00 |
|
Mark Otto
|
1e6c95cd5d
|
improve affix docs with step-by-step walk through of plugin behavior and required CSS
|
2013-11-29 20:39:00 -08:00 |
|
Mark Otto
|
7d456aef76
|
Update scrollspy docs to more clearly indicate usage
|
2013-11-29 20:25:07 -08:00 |
|
Mark Otto
|
a4c54b5e5d
|
Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar
|
2013-11-29 18:33:59 -08:00 |
|
Mark Otto
|
09cd5289ab
|
Fixes #11468: Prevent default gradient on in Firefox for Android
|
2013-11-29 17:47:27 -08:00 |
|
Mark Otto
|
b5f9cc2057
|
Merge branch 'master' into pr/11414
Conflicts:
dist/css/bootstrap.min.css
|
2013-11-28 15:55:17 -08:00 |
|
Mark Otto
|
0be94180b9
|
grunt
|
2013-11-28 15:45:45 -08:00 |
|
Mark Otto
|
d654f90502
|
Fixes #10147: Remove outline from carousel controls on focus
|
2013-11-28 15:37:11 -08:00 |
|
Mark Otto
|
9d939080e6
|
Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class
|
2013-11-28 14:22:31 -08:00 |
|
Mark Otto
|
c13524e7e0
|
Fixes #11553: Prevent double border on tables in panels without thead content
|
2013-11-28 12:49:51 -08:00 |
|
Mark Otto
|
9f68a5b241
|
Fixes #11516: Invert dropdown divider border in navbars
|
2013-11-28 12:39:39 -08:00 |
|
Mark Otto
|
9d485db721
|
run grunt after last merge
|
2013-11-28 12:34:42 -08:00 |
|
Mark Otto
|
ec9d4708d2
|
Merge pull request #11551 from masterbee/outlinetweak
removed color treatment of outline for easier integration
|
2013-11-28 12:31:18 -08:00 |
|
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 |
|
Guy Bedford
|
ac6cfbbaad
|
include jspm package configuration
|
2013-11-26 12:10:06 +02: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 |
|