Mark Otto
|
e45f12ad42
|
rearrange jekyll and docs
|
2013-02-12 12:44:41 -08:00 |
|
Mark Otto
|
8b9733b288
|
nuke what we don't need for jekyll
|
2013-02-12 12:25:05 -08:00 |
|
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 |
|
fat
|
501aabf572
|
remove prevent default on focus
|
2013-02-07 21:42:34 -08:00 |
|
fat
|
366e1e0a6d
|
only fire hidden once backdrop has been removed
|
2013-02-07 20:13:40 -08:00 |
|
fat
|
1bf070b4ce
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-07 19:47:01 -08:00 |
|
fat
|
d8a7a380bc
|
if no callback, don't try to call callback ya goof
|
2013-02-07 19:45:42 -08:00 |
|
Mark Otto
|
a9729c5fd0
|
fix js from @fat feedback for modal
|
2013-02-07 19:38:46 -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
|
8ca70bd83a
|
Overhaul modal to make it responsive and not super lame
|
2013-02-06 02:07:40 -08:00 |
|
Mark Otto
|
421f9f67c4
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
|
2013-02-05 22:42:54 -08:00 |
|
fat
|
3b56227553
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-05 22:30:54 -08:00 |
|
fat
|
4814281540
|
clean up styles
|
2013-02-05 22:29:59 -08:00 |
|
Mark Otto
|
0fe9148b91
|
Fixes #6190: Add print utility classes
|
2013-02-05 22:17:28 -08:00 |
|
Mark Otto
|
1629df8008
|
screwed up a merge and an old version number crept in
|
2013-02-05 21:20:29 -08:00 |
|
fat
|
a4b31d39a2
|
don't hide if already hidden ya n00b
|
2013-02-05 21:08:56 -08:00 |
|
fat
|
a866a51a2e
|
clear interval in cycle + rebuild
|
2013-02-05 20:34:39 -08:00 |
|
fat
|
45656fc7fc
|
update jquery to 1.9
|
2013-02-05 20:00:50 -08:00 |
|
Mark Otto
|
5638b2559a
|
Verion number in JS makefile
|
2013-02-02 18:50:13 -08:00 |
|
Mark Otto
|
83e5c01856
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less
|
2013-01-31 17:57:31 -08:00 |
|
Mark Otto
|
3cc65cb86c
|
clear up show-grid stuff
|
2013-01-30 18:16:14 -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
|
5c76518f7d
|
Add respond.js to main docs pages, but only for IE8 and down
|
2013-01-17 14:00:03 -08:00 |
|
Mark Otto
|
b6b8633542
|
twerk docs code examples
|
2013-01-16 12:02:45 -08:00 |
|
Mark Otto
|
267690eb1b
|
docs changes, more type improvements, add grid system basics back
|
2013-01-15 14:30:00 -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 |
|
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
|
4b34f4947a
|
Update Holder.js 1.6 to 1.9
|
2013-01-12 19:49:15 -08:00 |
|
Mark Otto
|
6e5a2fedaa
|
Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago
|
2013-01-10 18:51:04 -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 |
|
Mark Otto
|
9749d6afc2
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2012-12-26 09:21:34 -06:00 |
|
Yohn
|
da0217405f
|
data-toggle instead of rel for tooltip and popover
|
2012-12-23 06:51:46 -05:00 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -08: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
|
e2434fefbd
|
chnage for #6248
|
2012-12-21 20:27:53 -08:00 |
|
fat
|
24a36df9f6
|
add support for [data-slide-to] attr on carousel
|
2012-12-21 19:45:19 -08:00 |
|
fat
|
818c56f078
|
rewrite makefile to make a bit more "efficient" + rebuild
|
2012-12-21 17:42:24 -08:00 |
|
fat
|
e194c3e4f4
|
rebuild
|
2012-12-21 17:25:31 -08:00 |
|
Mark Otto
|
a5e04c0799
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
|
2012-12-20 13:47:36 -08:00 |
|
Mark Otto
|
b6575cc72e
|
fix up code snippet
|
2012-12-20 13:41:08 -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 |
|
fat
|
e9eff0cbff
|
wait 100ms before engaging affix (allows for initial browser scroll)
|
2012-12-19 22:37:41 -08:00 |
|
fat
|
96e5fa6143
|
whitespace in tooltip + don't pass empty selector to $() in dropdown.js
|
2012-12-19 22:26:36 -08:00 |
|
fat
|
7c456c8554
|
fix tooltip doc dumbness
|
2012-12-19 22:05:33 -08:00 |
|
fat
|
219d275ae6
|
can't extend bounding box thingy
|
2012-12-19 22:03:57 -08:00 |
|
fat
|
dc4e80a655
|
fix ghetto ass timeout shit
|
2012-12-19 21:55:23 -08:00 |
|