Mark Otto
bc0b94a3fd
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
Mark Otto
9376a7c221
Fixes #5729 : Nested striped tables
...
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08 12:57:21 -08:00
Mark Otto
cacc213762
Nesting tables
...
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
2012-12-08 12:52:19 -08:00
Mark Otto
b9292ff90c
Merge pull request #6165 from Quy/2.2.2-wip
...
Apply code tag to data attribute on javascript page
2012-12-08 12:17:46 -08:00
Quy Ton
3bd9a26c01
Apply code tag to data attribute on javascript page
2012-12-08 12:06:46 -08:00
fat
820a3b27b6
get tests passing for typeahead :P
2012-12-07 19:16:48 -05:00
fat
1747caf19d
insert menu of typeahead after input which it suggests on #3529
...
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
fat
437654030a
focus on escape in typeahead
2012-12-07 18:37:32 -05:00
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
be5f31480b
Nuke all i18n tags from .mustache templates
2012-12-05 11:09:02 -08:00
Mark Otto
306c1b4914
Remove commented out old popover CSS
2012-12-05 11:06:16 -08:00
Mark Otto
33e14fe5bf
Merge branch '2.2.2-wip' into 3.0.0-wip
...
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
b3019d7aab
add gallery page, fill with a few screenshots to start
2012-12-04 20:30:21 -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
9c028ea54b
follow button width
2012-12-01 18:51:03 -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
19ee7999f4
remove single corner border-radius mixins
2012-12-01 14:25:28 -08:00
