rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
8,734 Commits 108 Branches 89 Tags 552 MiB
aedee95dbf
Commit Graph

481 Commits

Author SHA1 Message Date
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