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

7504 Commits

Author SHA1 Message Date
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
Zlatan Vasović
702ad4c302 Remove redundant comments 2013-11-29 11:37:06 +01:00
Zlatan Vasović
08e41d769a Add missing last column float 2013-11-29 08:37:54 +01: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
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
Jonas Weber
62299240d8 Issue #11550 : Easily copyable classes
Removed all the periods. Tested in Chrome and Firefox
(current versions). In Chrome you get a stray newline when
triple-clicking, in Firefox it is clean.

fixes #11550
2013-11-21 22:59:12 +01: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
Mario Bonito
55af003669 removed color treatment of outline 2013-11-20 16:44:44 -05: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
Zlatan Vasović
8f589c6cfd Add 'in' to complete thought
Simple grammar fix.
2013-11-19 13:29:19 +01:00
aentan
ba4c5dae9b add support for button dropdowns in justified button groups 2013-11-19 17:24:49 +08:00