root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8,076 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

394 Commits

Author SHA1 Message Date
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
Chris Rebert b9216a292c update to Holder.js 5b79144fa 2014-01-13 17:50:17 -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
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 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 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
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
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
Mark Otto ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Gregory HOULLIER a53cf55be2 Replace getElementsByTag by querySelector for IE10 Mobile plateform. 2014-01-05 20:15:48 +01: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
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 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 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
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