Mark Otto
c8614c0f15
Merge branch 'master' into pr/12490
...
Conflicts:
less/list-group.less
2014-03-06 21:32:52 -08:00
mrmrs
4868096dbd
Fixes #12934
2014-03-06 21:05:29 -08:00
Mark Otto
17e41098c8
Fixes #12824 : Remove white-space: nowrap from code elements
2014-03-06 20:39:19 -08:00
Mark Otto
8526adf69c
grunt
2014-03-06 20:33:10 -08:00
XhmikosR
d7dc8a7bd3
Merge pull request #12853 from twbs/jscs
...
Switch to JSCS
2014-03-05 08:42:50 +02:00
Mark Otto
a4df363174
grunt after merging #12917
2014-03-04 14:35:23 -08:00
Mark Otto
026e2f8d30
Grunt after merging #12863
2014-03-04 14:24:09 -08:00
Mark Otto
8f2a787c36
grunt
2014-03-04 14:20:48 -08:00
Mark Otto
d6e07f045c
Merge branch 'master' into rtl_via_css_flip
...
Conflicts:
docs/assets/js/raw-files.min.js
2014-03-04 00:41:57 -08:00
Mark Otto
1399497a02
grunt
2014-03-04 00:30:40 -08:00
Mark Otto
587814f16e
Simplify gruntfile more to remove theme RTL
2014-03-03 22:49:43 -08:00
Mark Otto
7e764a29fa
grunt
2014-03-03 21:56:40 -08:00
XhmikosR
e5affbfa0a
Run grunt.
2014-03-01 20:58:53 +02:00
XhmikosR
dfb4917493
Update less.js to v1.7.0.
2014-03-01 20:14:49 +02:00
XhmikosR
537e10033e
Switch to using JSCS for the indentation check.
2014-02-28 17:30:08 +02:00
Mark Otto
4ccf088a24
Merge branch 'master' into pr/12813
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-22 12:20:53 -08:00
Mark Otto
b99be29f32
Fixes #12756 : Ensure horizontal dls are cleared by moving the clearfix out of the media query
2014-02-22 12:13:11 -08:00
Supergibbs
49094844ac
Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694
2014-02-21 20:51:06 -08:00
Mark Otto
4b622c60c1
grunt
2014-02-21 17:42:25 -08:00
XhmikosR
65ffe69bdf
Fix customizer.js indentation warnings.
2014-02-14 11:02:03 +02:00
XhmikosR
ff2c506d2b
Update less.js to v1.6.3.
2014-02-13 20:54:21 +02:00
Mark Otto
a365d8689c
grunt
2014-02-13 09:24:59 -08:00
Mark Otto
385fb68981
grunt
2014-02-13 08:59:03 -08:00
Mark Otto
88fdd45427
v3.1.1 bump
2014-02-13 01:12:26 -08:00
Zlatan Vasović
fe2222e733
Fix multistr errors in customizer.js
2014-02-12 20:54:43 +01:00
Chris Rebert
40142bdc51
fix #12708 by updating class names in the docs JS
2014-02-12 11:02:56 -08:00
XhmikosR
5796b56d96
Switch to the minified JSZip.
2014-02-12 20:50:47 +02:00
Mark Otto
eb20d6f132
Fixes #11659 , #12698 , and #12349 : Always apply position and z-index form controls in input groups for proper borders
2014-02-11 14:20:01 -08:00
Mark Otto
8551f42ae2
Merge branch 'master' into pr/12412
...
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
2014-02-11 09:50:40 -08:00
Mark Otto
38ebf57af5
grunt
2014-02-10 21:41:14 -08:00
Mark Otto
784a95d945
Documents #10140
2014-02-10 21:34:05 -08:00
Mark Otto
728067b586
Update Glyphicons
2014-02-10 21:28:05 -08:00
Mark Otto
3350c73666
http://www.youtube.com/watch?v=YQwYNca4iog
2014-02-10 20:52:20 -08:00
Mark Otto
b36d19c3c6
grunt
2014-02-08 16:46:12 -08:00
Mark Otto
7f88009394
grunt
2014-02-08 16:43:58 -08:00
Mark Otto
3fc7a4cffa
grunt with new mixins
2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9
grunt
2014-02-08 16:13:30 -08:00
Mark Otto
866c52b928
grunt
2014-02-08 15:51:38 -08:00
XhmikosR
5d8491ac9f
Merge pull request #12655 from twbs/holder.js
...
Update holder.js to v2.3.1.
2014-02-09 01:48:13 +02:00
Mark Otto
06e6affa4a
Merge pull request #12645 from ZDroid/docs-js-semicolons
...
Omit semicolons consistently in docs
2014-02-08 15:46:51 -08:00
Mark Otto
b683433f67
grunt
2014-02-08 15:44:13 -08:00
XhmikosR
c3cb63b69f
Update holder.js to v2.3.1.
...
Fix #12653 .
2014-02-08 18:19:39 +02:00
Zlatan Vasović
bdf9ce4c45
Omit semicolons consistently in docs
2014-02-07 19:31:08 +01:00
Zlatan Vasović
aead10fafa
Avoid setting jshint node: true in every Grunt JS file
2014-02-07 13:34:17 +01:00
Mark Otto
3ccc16cad0
grunt for days
2014-02-07 02:24:37 -08:00
Mark Otto
228d4e59fc
Fixes #12555 : Rearrange variables to place grids and containers closer
2014-02-07 01:22:30 -08:00
XhmikosR
aae64a9eba
Update jzip to v2.1.0.
2014-02-06 23:10:37 +02:00
XhmikosR
ec050fa0ab
Update less.js to v1.6.2.
2014-02-04 11:11:40 +02:00
XhmikosR
2576fecf95
Update jszip to the latest git ( 202003821d).
2014-02-04 11:08:12 +02:00
XhmikosR
389e574aaa
Update Filesaver.js to the latest git (2014-01-24).
2014-02-04 11:08:12 +02:00
Mark Otto
ec6c9d2824
Don't offset customizer alert, grunt dist
2014-02-04 00:18:34 -08:00
Mark Otto
58bf3f9432
grunt after last commits
2014-01-31 13:40:32 -08:00
XhmikosR
7b9c0a38a7
Downgrade holder.js to v2.2.0.
...
Fixes #12440 .
2014-01-31 09:32:55 +02:00
Mark Otto
1409cde7e8
Bump versions, run grunt
2014-01-30 08:30:37 -08:00
Mark Otto
9a6b7ab375
grunt
2014-01-30 08:14:18 -08:00
Mark Otto
d4b1bfd667
grunt
2014-01-29 22:44:06 -08:00
Mark Otto
6a0a139cda
Upgrade to Normalize v3-rc1 in prep for v3 final
2014-01-27 12:08:55 -08:00
Mark Otto
08e83a62b7
Fix #11655 : Fix broken disabled states for iOS form controls and buttons
2014-01-22 21:43:08 -06:00
Mark Otto
f4dd6221d4
Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
2014-01-13 20:01:54 -08:00
Chris Rebert
b9216a292c
update to Holder.js 5b79144fa
2014-01-13 17:50:17 -08:00
Chris Rebert
80bed836e0
grunt dist build-customizer
2014-01-12 14:53:21 -08:00
XhmikosR
f972331a10
update to FileSaver.js version 2013-12-27 / 0055d054ac
...
Refs #12196
2014-01-12 14:47:54 -08:00
Chris Rebert
4b5e73b842
add Blob.js separate from filesaver.js
...
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196
2014-01-12 14:41:30 -08:00
XhmikosR
ef22ab5aed
update less.js to v1.6.1 & use accurate filename; refs #12196
2014-01-12 14:32:58 -08:00
XhmikosR
77ff3871fd
update holder.js to v2.3; refs #12196
2014-01-12 14:23:41 -08:00
Mark Otto
1127cd6287
grunt dist
2014-01-11 14:48:47 -08:00
Mark Otto
e68d3b961e
Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
...
Conflicts:
package.json
2014-01-11 14:48:04 -08:00
Chris Rebert
8a10bd5231
grunt build-customizer
2014-01-08 18:39:45 -08:00
XhmikosR
d7bf9372ec
Remove extra newline from banner.
2014-01-08 13:41:17 +02:00
XhmikosR
016d573a80
Use the docs banner for all the docs generated files.
2014-01-08 13:41:17 +02:00
XhmikosR
ebf7807985
docs-assets: concatenate and minify all javascript files.
2014-01-08 13:41:16 +02:00
Chris Rebert
c891be5e5f
adjust filename to indicate that customize JS is minified
2014-01-07 19:10:31 -08:00
Chris Rebert
ef7bf0abf8
grunt dist build-customizer
2014-01-07 19:05:29 -08:00
Chris Rebert
c635d8f547
have customizer output Bootstrap Theme too; fixes #12003
2014-01-07 18:57:15 -08:00
Chris Rebert
07309edce5
make customizer compilation code more generic
2014-01-07 18:55:13 -08:00
Julian Thilo
7fcfe61f4d
Update copyright notices in all places
...
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Gregory HOULLIER
a53cf55be2
Replace getElementsByTag by querySelector for IE10 Mobile plateform.
2014-01-05 20:15:48 +01:00
Zlatan Vasović
1c83d68ca4
New Year
2014-01-01 15:37:08 +01:00
Mark Otto
50cf0b1a9d
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030 : navbar toggle focus state
2013-12-31 18:23:10 -08:00
Mark Otto
0df96d8c32
Merge branch 'master' into docs_dir
2013-12-31 10:38:31 -08:00
Mark Otto
a9c829bc0c
Rearrange repository contents because muahahahahahaha
2013-12-28 22:47:03 -08:00
Chris Rebert
336f5f1dce
rename raw-files.js to raw-files.min.js
...
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
2014-01-19 22:29:51 -08:00
Chris Rebert
06a7bdd0b0
grunt build-raw-files dist
2014-01-19 22:27:01 -08:00
Chris Rebert
b67cba2b4d
make WP8 device-width hack code fully consistent between docs HTML & docs JS
2014-01-18 18:35:47 -08:00
XhmikosR
4bca3c79b3
Move docs third-party libraries to a separate folder.
2014-01-18 08:15:21 +02:00
Mark Otto
d07e8fece4
grunt
2014-01-16 15:03:34 -08:00
fat
3b2418e688
remove flaky pos bottom test which is effect by unit scroll pos
2014-01-16 13:44:08 -08:00
Mark Otto
a633fc042d
Merge branch 'master' into docs_derp
...
Conflicts:
docs/components.html
docs/css.html
2014-01-15 13:08:35 -08:00
Chris Rebert
5ead87d519
revert unnecessary customizations of Blob.js & FileSaver.js
...
Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.
Refs ea591748ed
2014-01-14 20:46:25 -08:00
Mark Otto
cae63200d8
Merge branch 'master' into docs_derp
...
Conflicts:
docs/_includes/old-bs-docs.html
2014-01-14 15:53:06 -08:00
Chris Rebert
46b0874ef5
add copyright notice to raw-files.js
2014-01-14 13:27:50 -08:00
Zlatan Vasović
c335104957
Rename uglify.js to uglify.min.js for consistency
2014-01-14 13:41:21 +01:00
Mark Otto
eca81939cc
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/css/pack.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
2014-01-13 22:43:18 -08:00
Chris Rebert
ea591748ed
sort out attribution banners of docs assets; fixes #11976
2014-01-13 21:58:27 -08:00
Chris Rebert
2d038186e3
add a title/description to customizer.js's attribution comment
2014-01-13 21:08:04 -08:00
Mark Otto
b17dca240e
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/js/docs.min.js
2014-01-12 16:10:57 -08:00
Mark Otto
79c18da452
homepage improvements
2014-01-11 19:35:40 -08:00
Mark Otto
bacfd65cb2
Merge branch 'master' into docs_derp
...
Conflicts:
docs/getting-started.html
2014-01-11 19:13:10 -08:00
Mark Otto
ea20f44815
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/css/docs.css
2014-01-09 20:33:55 -08:00
Mark Otto
04161a8c75
more derp
2014-01-09 18:05:04 -08:00
Mark Otto
ed5c7baaf1
Merge branch 'master' into docs_derp
2014-01-05 17:49:40 -08:00
Mark Otto
70459c1454
Merge branch 'master' into docs_derp
...
Conflicts:
docs/_includes/footer.html
docs/assets/css/docs.css
2014-01-01 12:27:09 -08:00
Mark Otto
b253cb2c1e
Merge branch 'master' into docs_derp
...
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
2013-12-31 13:53:33 -08:00
Mark Otto
a8005b3d0b
flatten docs dir back into root
2013-07-18 17:41:30 -07:00
fat
4b40ee692d
cleaner way of preventing double click events + clean up tests for jshint
2013-07-18 01:07:11 -07:00
fat
37e899d766
get button js working with actual form elements p cooll
2013-07-18 00:59:31 -07:00
fat
8cf04911db
fixes #7776
2013-07-17 23:25:26 -07:00
fat
18d23b892c
rebuild js + fixes #7583
2013-07-17 21:35:28 -07:00
fat
2cccc0889f
make sure triggering element is visible before focusing #7521
2013-07-17 21:30:38 -07:00
fat
102df4ff33
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat
eb3333a612
fix #7000
2013-07-17 21:08:50 -07:00
fat
392bf0c9c9
fixes #6691
2013-07-17 20:29:41 -07:00
fat
f97dd5af49
rebuild doe
2013-07-17 19:33:21 -07:00
Mark Otto
817972724a
Remove further mentions of Glyphicons
2013-07-05 14:11:12 -05:00
Mu-An Chiou
55fa1acbd6
Tooltip: apply position class before positioning
2013-06-28 11:05:38 +01:00
Mark Otto
1a09eada35
Run make on JS
2013-06-28 00:08:19 -07:00
Mark Otto
6a2858f7bf
make on js i guess? /cc @fat
2013-06-27 19:36:35 -07:00
Mark Otto
2aec6dae59
Fixes #7730 : Better hiding of empty titles in popovers
...
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.
/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto
65ad52060e
Offcanvas example update
...
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto
b0bece66f2
Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example
2013-06-19 19:13:38 -07:00
Ivan Malopinsky
c1655e6cbd
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 23:16:56 -04:00
Mark Otto
949c7cca00
Merge pull request #8156 from baer/toggle-button-fix
...
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto
47f8ba98f3
Merge pull request #8158 from baer/download-button-fix-proper
...
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer
6771be1ced
Docs Customize "Customize and Download" button not working properly
2013-06-12 14:01:59 -06:00
Eric Baer
7f8703ef86
Docs Customize toggle button used incorrect selectors
2013-06-12 12:51:10 -06:00
Mark Otto
9fac2c0467
Update docs JS to prevent clicks on links with hash hrefs
2013-06-09 23:45:14 -07:00
Mark Otto
9ba11ba60a
No more need for grid column highlighting, so nuke that
2013-06-09 23:44:14 -07:00
Robert Burns
cc684750e5
Fix for carousel indicators
2013-06-01 08:15:40 -04:00
fat
f5ce66177b
fix event binding in modal.js
2013-05-29 11:24:00 -04:00
fat
a7a87c8e8c
rebuild
2013-05-27 12:48:16 -07:00
fat
9257bdc097
fixes #7163
2013-05-27 12:45:13 -07:00
Jacob Thornton
e424b3879c
fixes #4781
2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778
add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things
2013-05-24 23:15:04 -07:00
Mark Otto
3160bd872e
rearrange customizer content
2013-05-23 21:34:32 -07:00
Mark Otto
acc0875259
fix up customizer js and classes; turn buttons into real buttons
2013-05-22 23:34:28 -07:00
fat
e7b4fedee8
remove 3rd arg from $.each call
2013-05-22 15:18:30 -07:00
Jacob Thornton
7cbec6e89a
remove jszip files
2013-05-21 19:33:57 -07:00
Jacob Thornton
ccfa989898
upgrade jshint to 2.1.2 for anton <3
2013-05-21 19:31:51 -07:00
Mark Otto
c0f5a0775d
Run make on latest JS
2013-05-16 20:54:06 -07:00
Mark Otto
55a1416789
remove prettyprint js mention
2013-05-16 20:07:48 -07:00
fat
5ab72f7687
fix tooltip defaults
2013-05-16 18:45:53 -07:00
fat
c072b6b2fc
remove dumb assets update makefile wassup
2013-05-16 18:34:51 -07:00
fat
b239542a5e
carousel bug with data
2013-05-16 18:21:42 -07:00
fat
f37b351288
only overlay dropdowns for mobile
2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a
fix tests
2013-05-16 17:44:50 -07:00
fat
92245e8bc7
change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click
2013-05-16 12:50:06 -07:00
fat
a4c16155a2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
2013-05-16 11:08:46 -07:00
fat
14651035de
a bunch javascript junk
2013-05-16 11:06:30 -07:00
Mark Otto
3c3e56ca50
.bs-docs-top to .bs-top
2013-05-08 22:52:48 -07:00
Mark Otto
d7acf4e82d
more work on the sidenav, including small css refactor and new classes
2013-05-08 22:42:42 -07:00
Mark Otto
edb733ebc7
Super massive docs overhaul
...
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
2013-05-08 21:56:08 -07:00
Mark Otto
88dd9de9ba
Drop typeahead.js--instead try Twitter's typeahead plugin
2013-05-08 20:04:54 -07:00
William Ghelfi
9013ff002a
add offcanvas layout example based on bradfrost/this-is-responsive
2013-05-08 14:25:37 +02:00
Mark Otto
57ba494409
running make
2013-04-26 10:44:44 -07:00
Stephen Edgar
1a6dbc371e
'docs' folder .editorconfig code guide updates
2013-04-23 17:40:41 +10:00
Mark Otto
40f671a531
add basic back to top link via affix
2013-03-30 18:41:26 -07:00
Mark Otto
23d7215dbe
Modify scrollspy to add .active to all parent li items /cc @fat
2013-03-29 23:32:47 -07:00
Mark Otto
081c061281
new subnav on all pages
2013-03-28 00:21:21 -07:00
Mark Otto
fe414d8566
turn docs navbar into left navbar
2013-03-27 23:33:45 -07:00
Mark Otto
a70c50d1f7
Merge branch 'master' 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/index.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
package.json
2013-03-01 12:37:21 -08:00
fat
839b0c893f
shiiiit
2013-02-28 21:15:33 -08:00
fat
3469339068
2.3.1
2013-02-28 20:55:14 -08:00
fat
cec434a4c3
rebuild
2013-02-28 20:48:48 -08:00
fat
2f27d9851c
whitespace
2013-02-28 20:48:02 -08:00
fat
01e0f8c653
only pass unique options through to child nodes in tooltips
2013-02-28 20:39:07 -08:00
fat
cf998040ec
rebuild
2013-02-28 19:49:08 -08:00
fat
40b7a909a6
le sigh
2013-02-28 19:37:30 -08:00
Mark Otto
4cbb663d9d
Update some links and rename #gridsystem to #grid-system
2013-02-17 18:10:29 -08:00
Mark Otto
6d048471c4
Re-add carousel captions as optional
...
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto
979ca4ea7a
Convert JS page to pygments; nuke prettify assets
2013-02-14 22:33:26 -08:00
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
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
Jacob Thornton
4ca1cba3f8
upgrade jquery to 1.7.2 #3379
2012-06-02 18:25:07 -07:00
Jacob Thornton
b07b869b26
rebuild assets
2012-06-02 18:15:23 -07:00
Jacob Thornton
806a82ef83
add relatedTarget to carousel slide event
2012-06-02 18:06:00 -07:00
Jacob Thornton
f836473129
add html option back to tooltip and popover to explicitly prevent XSS #3421
2012-06-02 17:55:10 -07:00
Jacob Thornton
fc96bc8bba
rebuild doi
2012-06-02 17:30:00 -07:00
Jacob Thornton
5b401a8c16
add collapsed class to collapse invoker when it's target is collapsed #3525
2012-06-02 17:28:38 -07:00
Jacob Thornton
5e5965ca6f
Merge branch 'accessibility' into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663
2.0.3 -> 2.0.4
2012-06-01 11:04:27 -07:00
Jacob Thornton
4eaeea81fd
rebuild and fix test
2012-05-31 10:24:23 -07:00
Jacob Thornton
9889948f58
abandon activedescendant because it was awful
2012-05-17 00:39:14 -07:00
Jacob Thornton
a7b49a7d92
nearly everything working with activedescendant... then decide it's wrong.
2012-05-17 00:23:11 -07:00
Jacob Thornton
10c6db4b14
add proper role to dialog markup and cleanup modal logging
2012-05-16 19:43:22 -07:00
Jacob Thornton
a404ac33bb
modal accessibility tab control
2012-05-16 19:09:57 -07:00
Jacob Thornton
ffb4d9025b
rebuild with typeahead change
2012-04-25 22:15:39 -07:00
Jacob Thornton
a29e5a9dd6
fix #3234
2012-04-25 21:52:05 -07:00
Jacob Thornton
aaabe2a46c
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)
2012-04-24 18:06:41 -07:00
Jacob Thornton
839ef3a030
2.0.2 -> 2.0.3
2012-04-24 02:19:02 -07:00
Jacob Thornton
73453c7f79
changes for build in preperation for 2.0.3 release
2012-04-24 02:02:06 -07:00
Jacob Thornton
bc07e2adae
allow for pushstate in scrollspy
2012-04-18 13:35:14 -07:00
Jacob Thornton
8f98c4fbf6
offset -> position #3088
2012-04-18 13:15:13 -07:00
Jacob Thornton
f3cf4cbaae
rebuild
2012-04-16 17:36:03 -07:00
Jacob Thornton
6cf9906a60
build bootstrap.js and bootstrap.min.js into docs
2012-04-15 17:03:33 -07:00
Jacob Thornton
0b8042656f
fixes #2941 + whitespace in collapse
2012-04-15 16:15:32 -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
cf4924764c
rebuild with tooltip formatting change
2012-04-14 23:11:19 -07:00
Jacob Thornton
c7dc4cc573
change position of var in dropdown + cleanup makefile vars
2012-04-14 22:43:36 -07:00
Jacob Thornton
82267d48ff
calling pause on a slide should actually pause it - even when hovering
2012-04-14 17:49:51 -07:00
Jacob Thornton
3408064d00
hack for subnav
2012-04-14 17:15:03 -07:00
Jacob Thornton
575f18aaf4
add jshint support + a few minor stylistic changes
2012-04-14 16:29:53 -07:00
Jacob Thornton
08fee005a8
https://github.com/twitter/bootstrap/issues/2954
2012-04-07 21:26:46 -07:00
Jacob Thornton
83febb3452
remake and add isHTML check to popover as well
2012-04-04 15:02:30 -07:00
Jacob Thornton
2dc979a202
MSTransitionEnd + move paren (thanks rick waldron)
2012-03-29 14:14:17 -07:00
Jacob Thornton
0665c3ebf7
move over paren just because.
2012-03-29 13:55:56 -07:00
Jacob Thornton
422d04cb2b
simplify transition plugin a little
2012-03-29 13:51:23 -07:00
Jacob Thornton
30b3f47e31
remove "technique"
2012-03-29 12:48:37 -07:00
Jacob Thornton
8ea8c312ea
replace UA sniffing
2012-03-29 12:35:06 -07:00
Jacob Thornton
3e7920820a
add missing closing brace
2012-03-24 20:01:51 -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
ef5ac02b69
allow prevent default for show and hide event in modal
2012-03-24 17:50:21 -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
94b24aaa47
clear timeout to reset delays for tooltip/popover
2012-03-21 21:57:06 -07:00
Jacob Thornton
22963d7346
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-21 21:37:17 -07:00
Jacob Thornton
d5fb653914
top stripping leading and trailing whitespace + always use .html method
2012-03-21 21:35:02 -07:00
Jacob Thornton
cb8dcfcebf
if transitioning collapse, don't start new transition
2012-03-20 22:43:27 -07:00
Jacob Thornton
663e41d74f
prevent dropdowns from closing when clicking inside form element inside dropdown
2012-03-19 23:13:55 -07:00
Jacob Thornton
63bd7cb478
fix slide logic for ie+ in carousel
2012-03-19 21:39:39 -07:00
Jacob Thornton
bce33bbb09
if parent in collapse, only grab children
2012-03-19 21:10:55 -07:00
Jacob Thornton
630ff4ff7d
fix collapse bug in ie7+ for initial collapse in
2012-03-19 20:51:20 -07:00
Jacob Thornton
07d23b927e
add activate to scrollspy docs
2012-03-19 20:29:22 -07:00
Jacob Thornton
67f199678c
if interval is false, do not autocycle the carousel
2012-03-19 15:48:57 -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
56fe54df43
remove collapse class on open so that dropdowns are viewable
2012-03-12 13:37:44 -07:00
Jacob Thornton
af1dbf6581
rebuild
2012-03-08 11:39:50 -08:00
Mark Otto
1a781a707e
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-26 23:16:11 -08:00
Jacob Thornton
fb74018ae2
and pause on hover option to carousel
2012-02-24 21:51:39 -08:00
Jacob Thornton
d149a131c1
remake
2012-02-20 22:02:04 -08:00
Jacob Thornton
3d58b46226
fix bootstrap-button toggle regression + tests
2012-02-18 23:29:58 -08:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Jacob Thornton
9d12b2d601
don't try next if not next
2012-02-16 20:43:57 -08:00
Jacob Thornton
e730f8adb5
null out interval so that pause doesn't resume on next or prev
2012-02-16 20:22:01 -08:00
Jacob Thornton
f9b578260f
rebuild alerts
2012-02-16 20:05:09 -08:00
Jacob Thornton
6e77c9d123
add semicolons to the end of js files
2012-02-13 18:41:02 -08:00
Jacob Thornton
5b4a29d84e
honor data attributes set on modal as well
2012-02-12 11:15:12 -08:00
Jacob Thornton
139a077543
don't use e.target incase button has icon or other content inside it
2012-02-07 21:55:27 -08:00
Jacob Thornton
c8c4d5b392
fix alert tests + add show option back to modals
2012-02-06 00:17:31 -08:00
Jacob Thornton
e26da36b9a
remove 2.0-wip ref
2012-02-01 22:30:51 -08:00
Jacob Thornton
390a9af936
move js stuff into assets
2012-01-31 13:58:28 -08:00
Jacob Thornton
f622822459
check in dist dir for hb5 + update images to point to correct spot for builder
2012-01-29 16:19:41 -08:00
Jacob Thornton
12d3c2fe74
fix z-index issue with modals for popovers,tooltips,and dropdowns
2012-01-28 12:08:41 -08:00
Jacob Thornton
ab8f4a394c
remove js for table sorts
2012-01-28 01:48:45 -08:00
Jacob Thornton
09df780b75
clean up application js a bit
2012-01-28 00:46:04 -08:00
Jacob Thornton
4737d693e0
remove quick start section to simplify landing page + start rewriting application js to work ie7
2012-01-28 00:36:37 -08:00
Jacob Thornton
0255f47eb3
add zindex option for tooltips/popovers and fix modal zindex doc example
2012-01-27 21:36:58 -08:00
Jacob Thornton
c63175dc1d
change endpoint to point to actual server...
2012-01-26 22:52:44 -08:00
Jacob Thornton
dc2deb9a1b
moving structure around + more work on builder...
2012-01-26 21:48:46 -08:00
Jacob Thornton
1e9c2fb9d4
getting closer....
2012-01-26 20:23:15 -08:00
Jacob Thornton
12484a7471
more builder crap
2012-01-26 16:41:28 -08:00
Jacob Thornton
d531f72645
some js for javascript for builder (stil incomplete)
2012-01-26 16:12:34 -08:00
Mark Otto
f62c9379fb
remove all tablesorter assets and css
2012-01-25 20:07:27 -08:00
Mark Otto
b8fa6cfacf
move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page
2012-01-25 01:22:29 -08:00
Jacob Thornton
5e5e87fbd0
scrollspy working for sub navs
2012-01-24 22:33:33 -08:00
Mark Otto
672ba4c2fd
update the subnav on all pages
2012-01-24 19:19:50 -08:00
Jacob Thornton
a40d4993ed
make subnav fix
2012-01-24 17:13:02 -08:00
François Robichet
925fef4110
Typo on tablesorter
2012-01-24 22:11:09 +01:00
Jacob Thornton
b4b1ef6839
rebuild with new templates
2012-01-23 15:17:32 -08:00
Jacob Thornton
f764aee4b9
add templates for doc generation
2012-01-23 14:14:16 -08:00
Jacob Thornton
7444310c4d
only prevent default of links in sections
2012-01-20 20:05:16 -08:00
Jacob Thornton
6f2f947a43
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
2012-01-11 21:42:55 -08:00
Mark Otto
2948d1c3b2
overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class
2012-01-07 20:40:28 -08:00
Mark Otto
a339f0051b
fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples
2012-01-07 12:22:51 -08:00
Mark Otto
45d671d97f
tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend
2012-01-07 01:22:52 -08:00
Mark Otto
d6a1402f2a
update form shadows and tweak prettyprint styles
2012-01-07 01:03:26 -08:00
Mark Otto
cfc2353059
front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates
2012-01-06 23:59:22 -08:00
Mark Otto
9bedfa447c
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-05 21:43:54 -08:00
Mark Otto
c56e9d2d35
massive docs update, mostly to all our new forms, and to the buttons
2012-01-05 21:43:28 -08:00
Jacob Thornton
314feb702f
listen to window for dropdown clear
2012-01-05 18:32:08 -08:00
Mark Otto
90e3a706ba
add jank js back to docs application.js for responsive dropdown in topbar
2012-01-05 16:03:05 -08:00
Mark Otto
fb9401b355
tweaks abound, updated prettify styles, new sidenav component started, sprite icons started
2012-01-05 01:34:14 -08:00
Jacob Thornton
3396fc0542
check for prettyprint on window
2011-12-22 19:17:41 -08:00
Jacob Thornton
35fdbad24b
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
2011-12-22 19:15:09 -08:00
Jacob Thornton
efacac0d6c
clean up all the js across all the doc pages
2011-12-21 18:42:43 -08:00
Mark Otto
9fb380151d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/javascript.html
2011-12-21 18:39:02 -06:00
Mark Otto
20aecb9838
updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file
2011-12-21 16:22:20 -06: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
8545fe9787
greatly simply js plugins - remove js api where reasonable
2011-10-19 21:56:06 -07:00
Mark Otto
c579e4d550
expanding comment in application.js
2011-09-16 09:55:12 -07:00
Jacob Thornton
8896497ea8
update attributes for js and make tooltips reposition on resize
2011-09-15 21:19:39 -07:00
Jacob Thornton
fcf816a236
index to use data attr for scrollspy initilizing
2011-09-11 23:36:59 -07:00
Jacob Thornton
200f5817ba
method invocation jqueryui style
2011-09-11 21:03:17 -07:00
Jacob Thornton
173be3f1e8
change hella js... broke all the tests. i <3 wip
2011-09-11 20:08:43 -07:00
Jacob Thornton
d9cbcfc20d
wait for window load event before positioning images, doi
2011-09-10 22:54:47 -07:00
Jacob Thornton
64176caa97
add bootstrap-scrollspy
2011-09-10 22:14:57 -07:00
Jacob Thornton
a8d4475827
adds twipsy js to regular index for positioning
2011-09-10 14:52:45 -07:00
Jacob Thornton
5f4e30ed1d
move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like
2011-09-09 22:47:49 -07:00
Jacob Thornton
b086d94253
remove aria-control stuff
2011-09-09 00:00:03 -07:00
Jacob Thornton
5960711d0f
some more js love - update the docs with tabs/pills plugin
2011-09-08 20:21:03 -07:00
Jacob Thornton
8d2f14d8d0
tabssss
2011-09-08 19:13:08 -07:00
Jacob Thornton
fb8987148a
move javascript from examples into docs
2011-09-06 23:20:56 -07:00
Jacob Thornton
0e13f8dca1
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
...
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto
fa94b264fa
add temp second topbar to nav section, fix it's compatibility issues
2011-09-02 00:50:05 -07:00
Jacob Thornton
ed96f181c8
add topbar dropdown js
2011-08-27 21:46:50 -07:00
Mark Otto
4f67e135dc
adding dropdowns to tabs by refactoring the shizzzz out of them
2011-08-26 20:38:23 -07:00
Jacob Thornton
5193619ab0
clean up redundant google prettify code
2011-08-26 10:53:21 -07:00
Karthik Viswanathan
0a34a6d4b2
Made JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also removed unused class from hero demo.
2011-08-26 00:00:05 -07:00
Jacob Thornton
1fc4491cd6
simplify drop down logic - fix color of search hover for ie
2011-08-21 11:22:33 -07:00
Jacob Thornton
f1a6972281
fix drag knob in firefox #7
2011-08-19 20:37:12 -07:00
Mark Otto
163e68ade6
resolve merge conflict
2011-07-01 22:16:29 -07:00
Mark Otto
7962b36dae
misc updates to docs and form bug fix
2011-07-01 22:15:16 -07:00
Jacob Thornton
5a7f3f72cb
clean up js a tiny bit
2011-07-01 21:37:12 -07:00
Jacob Thornton
8245a7087e
add twipsies...
2011-07-01 21:30:12 -07:00
Mark Otto
460a84a926
Updated offset columns, fix app.js bug, misc tweaks to copy
2011-06-30 15:56:25 -07:00
Jacob Thornton
6687acc8ec
read application.js
2011-06-30 13:57:29 -07:00
Mark Otto
c53e394f71
changing stacked forms to be lined up left side w/ 20px
2011-06-30 13:51:13 -07:00
Mark Otto
bec9449136
Merge branch 'master' of http://git.local.twitter.com/bootstrap
2011-06-30 13:36:51 -07:00
Mark Otto
cde63b98bc
remove unnecessary js lang files from prettify, update styles for prettify
2011-06-30 13:36:47 -07:00
Jacob Thornton
89a05622ab
remove chilllli
2011-06-30 13:22:43 -07:00
Mark Otto
87f9ea00e4
updated docs
2011-06-30 13:17:58 -07:00
Mark Otto
588b2da937
updated docs, fixed language, added copy-code js for selecting text on focus
2011-06-30 10:40:28 -07:00
Mark Otto
dd769f9a6e
update to use latest version of bootstrap, docs cleanup, etc
2011-06-27 16:47:12 -07:00
Jacob Thornton
15a679e2d1
fancy scroll stuff and tiny js roundup/cleanup
2011-05-05 00:59:16 -07:00
Jacob Thornton
037bf9fec5
clean up org more
2011-05-04 23:49:31 -07:00
Jacob Thornton
96c3e70996
cleanup old stuff
2011-05-03 18:12:43 -07:00
