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
|
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 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -08:00 |
|
fat
|
e2434fefbd
|
chnage for #6248
|
2012-12-21 20:27:53 -08:00 |
|
Mark Otto
|
529ecc5a77
|
Version bump
|
2012-12-10 18:31:04 -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 |
|
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 |
|
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
|
98b0d475ae
|
version bump to 3.0
|
2012-11-30 22:30:50 -08:00 |
|
Mark Otto
|
79b7017227
|
version bump
|
2012-11-05 09:32:48 -08:00 |
|
fat
|
3b3dd3ac3c
|
2.2.1 - hotfix for carousel
|
2012-10-30 21:59:56 -07:00 |
|
Mark Otto
|
41ad16fe40
|
v2.2.0 instead of v2.1.2
|
2012-10-29 21:00:53 -07:00 |
|
Mark Otto
|
08b8571cb8
|
version bump to get this started
|
2012-09-05 10:00:57 -07:00 |
|
Mark Otto
|
1c134d9a7f
|
update version numbers to 2.1.1
|
2012-08-21 13:11:25 -07:00 |
|
Mark Otto
|
e510306196
|
bump versions to 2.1.0
|
2012-08-19 23:07:18 -07:00 |
|
Jacob Thornton
|
dcf75697ec
|
some progress on affix plugin
|
2012-07-22 18:28:39 -07:00 |
|
Jacob Thornton
|
354f99f0bd
|
add length to parent dropdown check #3316
|
2012-06-02 19:02:30 -07:00 |
|
Jacob Thornton
|
b07b869b26
|
rebuild assets
|
2012-06-02 18:15:23 -07:00 |
|
Jacob Thornton
|
ebc6935663
|
2.0.3 -> 2.0.4
|
2012-06-01 11:04:27 -07:00 |
|
Jacob Thornton
|
a29e5a9dd6
|
fix #3234
|
2012-04-25 21:52:05 -07:00 |
|
Jacob Thornton
|
839ef3a030
|
2.0.2 -> 2.0.3
|
2012-04-24 02:19:02 -07:00 |
|
Jacob Thornton
|
bc07e2adae
|
allow for pushstate in scrollspy
|
2012-04-18 13:35:14 -07:00 |
|
Jacob Thornton
|
be0efcfcfc
|
whitespace
|
2012-04-14 23:38:11 -07:00 |
|
Jacob Thornton
|
1ca1ef94ee
|
fix opera bug \o/ !!!! #1776
|
2012-04-14 23:24:19 -07:00 |
|
Jacob Thornton
|
575f18aaf4
|
add jshint support + a few minor stylistic changes
|
2012-04-14 16:29:53 -07:00 |
|
Jacob Thornton
|
f02d017ffa
|
return matcher value directly + cleanup first lines of files
|
2012-03-24 18:59:04 -07:00 |
|
Jacob Thornton
|
bccc2cb719
|
add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last
|
2012-03-24 18:20:09 -07:00 |
|
Jacob Thornton
|
b3bf223617
|
filter out non matches in map
|
2012-03-21 23:59:27 -07:00 |
|
Jacob Thornton
|
20e085723b
|
cache $(href) lookup
|
2012-03-21 23:51:32 -07:00 |
|
Jacob Thornton
|
706ee46b73
|
sort scrollspy to prevent flicker for unordered nav
|
2012-03-21 23:45:58 -07:00 |
|
Jacob Thornton
|
384a082e8d
|
active - onActivate
|
2012-03-19 20:24:46 -07:00 |
|
Jacob Thornton
|
05e0d5f3d9
|
fire active event on active
|
2012-03-19 16:09:08 -07:00 |
|
Jacob Thornton
|
bf59220b87
|
;)
|
2012-03-19 15:19:01 -07:00 |
|
Jacob Thornton
|
5a2c7eb50a
|
select last item in scrollspy if you've reached the bottom of the document or element
|
2012-03-19 15:18:00 -07:00 |
|
Jacob Thornton
|
59503e71ff
|
2.0.2 derp
|
2012-03-12 14:09:38 -07:00 |
|
Jacob Thornton
|
7ec09d0db9
|
2.0.1
|
2012-02-16 22:42:38 -08:00 |
|
Jacob Thornton
|
6e77c9d123
|
add semicolons to the end of js files
|
2012-02-13 18:41:02 -08:00 |
|
Jacob Thornton
|
e61164e67a
|
all unit tests passing in ie7
|
2012-01-28 01:35:13 -08:00 |
|
Mark Otto
|
5844aa550d
|
consistent new lines at ends of files
|
2012-01-26 15:00:59 -08:00 |
|
Jacob Thornton
|
5e5e87fbd0
|
scrollspy working for sub navs
|
2012-01-24 22:33:33 -08:00 |
|
Jacob Thornton
|
2187e0838f
|
change scrollspy offset to be option + fix typo in scrollspy
|
2012-01-21 21:35:20 -08:00 |
|
Mark Otto
|
16eccc43d9
|
dates updated to 2012
|
2012-01-14 23:28:48 -08:00 |
|
Jacob Thornton
|
f72a94ae28
|
update more readme changes - introduce target specificty convention to more plugins
|
2011-12-20 23:28:48 -08:00 |
|
Jacob Thornton
|
0980a33b47
|
update all to new on api + add animation support to tabs
|
2011-12-20 19:37:41 -08:00 |
|
Jacob Thornton
|
1ef5fa7d6b
|
giant refactor - all spec passing again...
|
2011-12-20 18:02:47 -08:00 |
|
Jacob Thornton
|
cee2f61898
|
define constructor on prototypes
|
2011-11-30 22:42:22 -08:00 |
|
Jacob Thornton
|
46fe38386a
|
rename tabs to tab - clean up lots of api stuff make href acceptable target val
|
2011-11-27 17:04:55 -08:00 |
|
Jacob Thornton
|
bd8745a98b
|
allow scrollspy to target a specific nav
|
2011-11-25 17:30:52 -08:00 |
|
Jacob Thornton
|
96adf8f918
|
fix copy paste bug
|
2011-11-24 20:27:55 -08:00 |
|