fat
10e72e158d
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 17:50:34 -05:00
fat
91fbadad5b
remove slide from carousel constructor #5579
2012-12-07 17:49:05 -05:00
billy gates
c362e72660
Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
...
Fix issue with double move event firing in typeahead.
2012-12-07 14:16:51 -08:00
fat
66b70016d0
rebuild and only select visible dropdown items
2012-12-07 17:14:49 -05:00
billy gates
2526c3fdbe
Merge pull request #6118 from godric7/master
...
scrollSpy - add parent scrollTop to offset calculation
2012-12-07 14:11:18 -08:00
fat
a7eb9c294a
add noConflict functionality to all bootstrap plugins
2012-12-07 17:06:01 -05:00
Mark Otto
1c5b8e967e
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 09:51:57 -08:00
Mark Otto
be45a821bb
Fixes #6148 : Icons in mini buttons properly aligned
2012-12-07 09:51:01 -08:00
Mark Otto
1413f976ae
Merge pull request #6151 from tierra/pre-code-white-space-fix
...
Fix code block white-space breaks within pre tags.
2012-12-07 09:48:14 -08:00
Mark Otto
cc6fda2262
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 09:43:32 -08:00
Mark Otto
2c7ab23d7a
Fixes #6136 : Proper scoping of breadcrumbs divider
2012-12-07 09:43:09 -08:00
Mark Otto
2877f84579
Merge pull request #6143 from Quy/2.2.2-wip
...
Escape ×
2012-12-07 09:41:17 -08:00
Bryan Petty
f4466dd9c7
Fix code block white-space breaks within pre tags.
2012-12-06 11:33:00 -07:00
Quy Ton
81679981c5
Escape ×
2012-12-05 15:28:14 -08:00
Mark Otto
306c1b4914
Remove commented out old popover CSS
2012-12-05 11:06:16 -08:00
Mark Otto
ed74992853
Fixes #4550 : Temporary fix for dropdown taps on mobile
...
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Mark Otto
12916b06aa
Fix up display of dropdown submenu examples on responsive views
2012-12-04 18:25:16 -08:00
Mark Otto
e31c7fb8a5
correct link on index page to grid system
2012-12-04 09:49:18 -08:00
Godric
8b959cacbc
Update js/bootstrap-scrollspy.js
...
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
2012-12-04 01:21:07 +01:00
Mark Otto
0f2a423b8d
Once more, update all the favicons to retina
2012-12-03 13:25:56 -08:00
Mark Otto
15a4399015
Align the touch icons attributes
2012-12-03 13:22:10 -08:00
Mark Otto
869b69c66c
Fixes #6115 : scope breadcrumb styles to immediate children only
2012-12-03 13:09:38 -08:00
Mark Otto
06582edb2a
Improve rendering of carousel example for IE10
2012-12-03 13:01:27 -08:00
Mark Otto
d470fb72da
nuke comments
2012-12-03 09:23:02 -08:00
Andreas Cederström
68cbba347b
Fixing header color for success, error and info alerts
2012-12-03 14:20:14 +01:00
Mark Otto
eca23e9b0f
add source attribution for IE10 fix
2012-12-02 21:01:53 -08:00
Mark Otto
f514c87d6b
Enable responsive features in IE10 when snapped
2012-12-02 20:57:34 -08:00
Mark Otto
30d6a71ccd
Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10
2012-12-02 20:40:24 -08:00
Mark Otto
439ff09701
herpderp
2012-12-02 18:15:40 -08:00
Mark Otto
c8862d91bc
Readme reorg
...
* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section
2012-12-02 13:14:49 -08:00
Mark Otto
139f1be49d
reset text align in popovers given inline insertion
2012-12-02 02:30:00 -08:00
Mark Otto
ea61cdb740
remove overrides on inner html of popover-content
2012-12-02 01:34:58 -08:00
Mark Otto
32d425967a
run make on js changes to popover
2012-12-02 01:32:23 -08:00
Mark Otto
85c57c6ba8
Merge branch 'Moveo-master' into 2.2.2-wip
2012-12-02 01:32:13 -08:00
Mark Otto
e8b3c36068
run make on modal popover fix
2012-12-02 00:09:45 -08:00
Mark Otto
dbb244cb97
Merge pull request #6097 from blakeembrey/modal-body-relative
...
Add relative positioning to .modal-body
2012-12-01 17:45:33 -08:00
Blake Embrey
fbec803b55
Add relative positioning to .modal-body - Fixes #5991
2012-12-02 09:53:05 +10:00
Mark Otto
bca3ff4ed6
Fixes #5853 : Maintain 10px margin above help block when following input groups
2012-11-29 23:39:33 -08:00
Mark Otto
f087b3428c
remove element from selector
2012-11-29 23:33:09 -08:00
Mark Otto
fe7b6decb1
Merge pull request #6039 from desheikh/2.2.2-wip
...
help-block margin-top should also apply after a span.uneditable-input
2012-11-29 23:32:38 -08:00
Mark Otto
322a56354f
run make with nav img fix
2012-11-29 23:27:20 -08:00
Mark Otto
721b568303
update comment
2012-11-29 23:27:09 -08:00
Mark Otto
c5173cdb92
Merge branch 'idavemm-patch-1' into 2.2.2-wip
2012-11-29 23:26:22 -08:00
Mark Otto
52e669d619
Merge branch '2.2.2-wip-holder' into 2.2.2-wip
2012-11-29 21:35:57 -08:00
Mark Otto
38c546c785
upgrade to holder 1.6
2012-11-29 21:35:45 -08:00
Mark Otto
12aa060efd
Merge branch 'jblotus-patch-1' into 2.2.2-wip
2012-11-29 21:06:20 -08:00
Mark Otto
e9c32fdf6d
Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1
2012-11-29 21:06:11 -08:00
Mark Otto
acc037de15
add holder and replace placehold.it
2012-11-29 20:59:14 -08:00
Zulfiqar Ali
ddd154481b
added compiled css file
2012-11-29 17:40:23 +08:00
Mark Otto
fa6a6dbb92
Merge pull request #6057 from ph-One/patch-3
...
Update Makefile's UglifyJS commands
2012-11-28 18:41:36 -08:00
