Mark Otto
|
2aa1a4dc70
|
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-07 22:18:53 -08:00 |
|
Mark Otto
|
9b1520ee60
|
update example code
|
2013-02-07 19:34:06 -08:00 |
|
Mark Otto
|
cfa1e39510
|
nuke that whitespace
|
2013-02-07 19:32:30 -08:00 |
|
Mark Otto
|
b04acb37e8
|
finish modal tweaks
|
2013-02-07 19:31:12 -08:00 |
|
Mark Otto
|
a623b8c10f
|
update docs modals
|
2013-02-07 19:21:56 -08:00 |
|
Mark Otto
|
cdb2147b13
|
add new modal to docs example
|
2013-02-07 19:00:48 -08:00 |
|
Mark Otto
|
e3f3542d0b
|
Fixes #6823: add some docs notes about tooltips in input groups
|
2013-02-06 17:25:58 -08:00 |
|
Mark Otto
|
0b4668368b
|
Merge branch '2.3.0-wip' into 3.0.0-wip
|
2013-02-05 22:47:00 -08:00 |
|
Mark Otto
|
2fa77bf197
|
Update link to changelog
|
2013-02-05 22:46:45 -08:00 |
|
Mark Otto
|
5e5670a1b4
|
Remove gallery link from navbar; add to homepage examples section instead
|
2013-01-31 18:00:11 -08:00 |
|
Mark Otto
|
1b128b3431
|
comment tweaks and updating starter template
|
2013-01-17 20:28:05 -08:00 |
|
Mark Otto
|
fd89531f6a
|
Update commenting and structure of layout.mustache
|
2013-01-17 20:26:17 -08:00 |
|
Mark Otto
|
d9b35c2602
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
|
2013-01-17 20:23:33 -08:00 |
|
Mark Otto
|
b30b8c2c12
|
Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though.
|
2013-01-17 17:02:35 -08:00 |
|
Mark Otto
|
f6226c9b91
|
Update Getting Started page to include mention of Respond
|
2013-01-17 14:49:52 -08:00 |
|
Mark Otto
|
5c76518f7d
|
Add respond.js to main docs pages, but only for IE8 and down
|
2013-01-17 14:00:03 -08:00 |
|
Mark Otto
|
7e46b6f636
|
Update nav and add bounds for tablet container
|
2013-01-17 00:58:34 -08:00 |
|
Mark Otto
|
337741fc9a
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2013-01-14 00:33:16 -08:00 |
|
Mark Otto
|
f9ee99cf6f
|
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
|
2013-01-14 00:11:55 -08:00 |
|
Yohn
|
a23eb06536
|
fix typo
|
2013-01-13 15:32:51 -05:00 |
|
Yohn
|
fdd1daeae1
|
added container options to docs for popover
|
2013-01-13 15:21:31 -05:00 |
|
Mark Otto
|
7d8d5c7838
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
|
2013-01-13 04:26:52 -08:00 |
|
Mark Otto
|
42efd9f730
|
Address #6545: clarify initialization of tooltips in docs
|
2013-01-11 20:58:24 -08:00 |
|
Mark Otto
|
330b143b40
|
Add longer tooltip example to docs, tighten up line-height on tooltip; run make
|
2012-12-26 09:36:07 -06:00 |
|
fat-kun
|
b9c7f29134
|
Merge pull request #6378 from Yohn/patch-7
fixes tooltip insert problems
|
2012-12-24 16:17:25 -08:00 |
|
Yohn
|
2a5fde272c
|
Update docs/javascript.html
|
2012-12-24 19:01:56 -05:00 |
|
Yohn
|
5da8b315c0
|
data-toggle instead of rel for tooltip and popover
|
2012-12-23 07:00:03 -05:00 |
|
Yohn
|
f152dead92
|
Update docs/javascript.html
|
2012-12-23 04:25:27 -05:00 |
|
fat
|
2c0ed072b0
|
shifting focus to parent and adding aria menuitem for dropdown
|
2012-12-22 13:57:57 -08:00 |
|
fat
|
4d195222d4
|
remake js
|
2012-12-22 13:48:28 -08:00 |
|
fat
|
fad0fb683b
|
allow multiple trigger types in tooltip and popover + default tooltip to hover & focus
|
2012-12-22 13:24:37 -08:00 |
|
fat
|
ddd59f22c7
|
update mustace to reflect changes to data-slide-to
|
2012-12-21 20:19:33 -08:00 |
|
fat
|
24a36df9f6
|
add support for [data-slide-to] attr on carousel
|
2012-12-21 19:45:19 -08:00 |
|
Mark Otto
|
dc32555f5b
|
Fixes #6370: Add comment to docs on typeahead and autocomplete
|
2012-12-21 15:46:10 -08:00 |
|
Quy Ton
|
a27bf30f0d
|
Miscellaneous changes to docs
|
2012-12-20 21:38:53 -08:00 |
|
Mark Otto
|
6bd5dc7d9f
|
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
|
2012-12-20 13:53:38 -08:00 |
|
Mark Otto
|
acde2dc1ee
|
Nuke third lines form carousel examples
|
2012-12-20 00:20:00 -08:00 |
|
Mark Otto
|
72f13e2870
|
Merge branch '2.2.3' into 3.0.0-wip
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
|
2012-12-20 00:02:52 -08:00 |
|
fat
|
bbe4625672
|
lol we dont' have affix(refresh)
|
2012-12-19 23:39:26 -08:00 |
|
fat
|
7f9ff0ba5b
|
add js support for carousel indicators
|
2012-12-19 23:25:25 -08:00 |
|
Mark Otto
|
65edc9cd6e
|
Change .jumbotron usage in docs layout to .bs-docs-jumbotron
|
2012-12-19 21:42:36 -08:00 |
|
Mark Otto
|
6649918c7f
|
Merge conflicts
|
2012-12-08 22:45:39 -08:00 |
|
Mark Otto
|
b5ceca14db
|
Fix docs typos
|
2012-12-08 18:46:34 -08:00 |
|
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 |
|
Quy Ton
|
3bd9a26c01
|
Apply code tag to data attribute on javascript page
|
2012-12-08 12:06:46 -08:00 |
|
fat
|
a7eb9c294a
|
add noConflict functionality to all bootstrap plugins
|
2012-12-07 17:06:01 -05: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
|
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 |
|