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
fat
5bd8cdca91
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
2012-12-19 21:36:50 -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
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
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
91fbadad5b
remove slide from carousel constructor #5579
2012-12-07 17:49:05 -05:00
fat
66b70016d0
rebuild and only select visible dropdown items
2012-12-07 17:14:49 -05: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
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
Andreas Cederström
68cbba347b
Fixing header color for success, error and info alerts
2012-12-03 14:20:14 +01:00
Mark Otto
32d425967a
run make on js changes to popover
2012-12-02 01:32:23 -08:00
Mark Otto
dd11d0a3fa
move around social buttons
2012-12-01 13:47:07 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Mark Otto
38c546c785
upgrade to holder 1.6
2012-11-29 21:35:45 -08:00
Mark Otto
acc037de15
add holder and replace placehold.it
2012-11-29 20:59:14 -08:00
Mark Otto
05655ff4ff
fixes #5922 : clicking only button should download custom build
2012-11-15 09:14:54 -08:00
Mark Otto
79b7017227
version bump
2012-11-05 09:32:48 -08:00
Bradly Feeley
46b5e0cbc6
Fixing various spelling typos in the docs.
2012-11-02 16:34:21 -06:00
fat
3b3dd3ac3c
2.2.1 - hotfix for carousel
2012-10-30 21:59:56 -07:00
fat
404e4d9e9a
fix carousel and rebuild js
2012-10-30 21:32:15 -07:00
Mark Otto
41ad16fe40
v2.2.0 instead of v2.1.2
2012-10-29 21:00:53 -07:00
Jacob Thornton
ba2a99e7c4
don't lookup typeahead when shift alt or ctrl are pushed
2012-10-17 23:39:41 -07:00
Jacob Thornton
45046544a6
when static, refocus on click
2012-10-17 23:36:22 -07:00
Jacob Thornton
0b9d4e78ad
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 23:06:58 -07:00
Jacob Thornton
7f3b94c453
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
...
Conflicts:
js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates
d6ac499ca8
Merge pull request #5309 from erlendfh/dropdown-bugfix
...
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
Jacob Thornton
280d4aeb30
rebuild
2012-10-17 22:51:39 -07:00
Jacob Thornton
edc3eee5ea
fix carousel event
2012-10-17 22:26:44 -07:00
mfansler
e24b46b7f3
fixes #5336 : reorder focus() call to avoid scrolling
2012-10-16 12:27:43 -04:00
Erlend Halvorsen
e9a648cd39
Fixed bug in dropdown toggle where menu would only clear on the first drop down
2012-09-27 10:31:40 +02:00
Jacob Thornton
0540b63ab0
check affix pos on clicks - use timeout for clicks which scroll
2012-09-24 23:59:02 -07:00
Jacob Thornton
88b1e44dd6
change tooltip/popover insert strategy
...
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton
003fcccceb
change tooltip/popover html default to false for xss safety net
2012-09-24 23:15:36 -07:00
Jacob Thornton
ebf94c53a5
change transition.js, rebuild… travis maybe will be happy?
2012-09-20 16:50:36 -07:00
Jacob Thornton
fe38d12f12
rebuild - fix missing (
2012-09-20 16:26:00 -07:00
Jacob Thornton
667179f406
added support for jquery 1.8.*
2012-09-20 16:23:54 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Jacob Thornton
c52368d3c5
last rebuild before 2.1.1 release
2012-09-04 20:44:11 -07:00
Mark Otto
bf590d8c81
fixes #4958 : add version to minified js
2012-09-04 11:13:08 -07:00
Mark Otto
e27b1355b5
fixes #4771 : widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0
2012-08-28 10:12:04 -07:00
Jacob Thornton
3568146b28
only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements
2012-08-27 21:44:09 -07:00
Mark Otto
7d412b1e14
fixes #4741 : undo previous version's attempt at firefox gradient changes and add gradient tests
2012-08-27 21:18:55 -07:00
Jacob Thornton
601e252074
fix for #4761
2012-08-27 20:58:51 -07:00
Jacob Thornton
d797a5fbd7
fix for open elements under modal when .modal-open
2012-08-27 20:43:12 -07:00
Mark Otto
1c134d9a7f
update version numbers to 2.1.1
2012-08-21 13:11:25 -07:00
Mark Otto
6477ad1acf
fixes #4472 : manually change mustache file as well for typo
2012-08-21 12:57:41 -07:00
Jacob Thornton
320b75de63
add affix to zip
2012-08-20 23:13:43 -07:00
Jacob Thornton
2b5e09038a
small nits
2012-08-20 16:21:57 -07:00
Mark Otto
e510306196
bump versions to 2.1.0
2012-08-19 23:07:18 -07:00
Mark Otto
a667fd93ab
pre font-size increase; revert static top navbar, undo contents section for now
2012-08-19 23:01:24 -07:00
Mark Otto
7ed82c1223
font-size change on examples in getting started
2012-08-19 11:59:28 -07:00
Jacob Thornton
c9cef741f6
listen to touchstart for dropdowns on mobile
2012-08-18 20:18:15 -07:00
Jacob Thornton
45dddc59a1
add click option for tooltip, popover - make click default for popover
2012-08-18 19:54:30 -07:00
Jacob Thornton
1166b39630
removed some old stuff from application.js
2012-08-18 19:24:29 -07:00
Mark Otto
54c645e33d
tweak transition
2012-08-15 14:49:55 -07:00
Jacob Thornton
ff38c14948
stray ;
2012-08-14 21:23:29 -07:00
Jacob Thornton
dee57462e2
get affix actually working and update docs
2012-08-14 21:06:08 -07:00
Mark Otto
9f8ce77751
running make on previous changes
2012-08-13 10:05:19 -07:00
Jacob Thornton
2b2b3303e1
fix indexof on array for ie8
2012-08-02 16:58:25 -07:00
Jacob Thornton
48546c2735
aria-labelledby="myModalLabel" aria-hidden="true"
2012-08-01 20:26:44 -07:00
Dirk Ginader
6977d35eed
close #3531 added focus handling and removed the badly announced "times" close button from screenreaders
2012-08-01 20:11:16 -07:00
Jacob Thornton
c10a357bb3
don't bite so hard
2012-07-24 12:57:00 -07:00
Jacob Thornton
c98b75c979
added fade out on scroll - we can pull this if you prefer it
2012-07-24 00:48:45 -07:00
Jacob Thornton
e38fa4b1f4
fix scroll thinggg
2012-07-24 00:30:58 -07:00
Mark Otto
f085dbadd1
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/css/docs.css
docs/base-css.html
docs/components.html
docs/customize.html
docs/getting-started.html
docs/javascript.html
docs/scaffolding.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/customize.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/javascript.mustache
docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Jacob Thornton
dcf75697ec
some progress on affix plugin
2012-07-22 18:28:39 -07:00
Jacob Thornton
fae6c36874
adds minLength #3960
2012-07-22 14:50:52 -07:00
Mark Otto
a1ad6d124a
Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
...
Conflicts:
docs/extend.html
docs/templates/pages/extend.mustache
2012-07-17 20:57:20 -07:00
Martin Bean
74b167b86d
Moved JS to bottom as per best practices
2012-07-13 22:25:47 +01:00
Mark Otto
c6ee96c025
fix up subnav styles, add subnav search form styles, add some basic docs for subnav
2012-07-05 10:37:23 -07:00
Mark Otto
e7e183e55d
Merge branch 'tekezo-patch-1' into 2.1.0-wip
2012-06-25 16:49:13 -07:00
Mark Otto
508a93d9e3
make fixing of subnav work again
2012-06-24 21:07:20 -07:00
Takayama Fumihiko
e80f37b600
".linenums .tag" should be ".prettyprint .tag".
2012-06-24 15:26:39 +09:00
Mark Otto
59153205b3
run make on js files
2012-06-20 23:46:29 -07:00
Jacob Thornton
b2b000b750
change transition end name for opera
2012-06-20 10:40:56 -07:00
Mark Otto
860a96939a
fix grid tooltips, tweaks
2012-06-07 10:58:15 -07:00
Mark Otto
8ee0679522
updated javascripts for first pass at single column
2012-06-05 18:25:46 -07:00
Jacob Thornton
82ea5847a7
adds remote source to modal. Remote source can be specified in href or by providing a remote option #936
2012-06-03 21:26:54 -07:00
Jacob Thornton
31e8a358c3
check length so that pause, actually pauses
2012-06-03 11:24:19 -07:00
Jacob Thornton
2d3a0babd2
make active selector more specific #2043 and rebuild
2012-06-02 22:10:35 -07:00
Jacob Thornton
ebc1fe907d
only trigger $.support.transition.end when it exists
2012-06-02 21:09:13 -07:00
Jacob Thornton
3a751a63d4
fix multi carousel bug #3194
2012-06-02 21:01:45 -07:00
Jacob Thornton
555a3b0478
fix carousel when hiding a reshowing - make sure it always triggers transition end #3248
2012-06-02 20:28:08 -07:00
Jacob Thornton
0b827965d3
fix regression in typeahead #3313
2012-06-02 19:31:30 -07:00
Jacob Thornton
354f99f0bd
add length to parent dropdown check #3316
2012-06-02 19:02:30 -07:00
