rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
8,575 Commits 108 Branches 89 Tags 552 MiB
2ece8dd336
Commit Graph

2240 Commits

Author SHA1 Message Date
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
Zlatan Vasović
00f062fc7e Rename pack.min.css to docs.min.css to match with docs.min.js 2014-01-29 20:50:10 +01: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
d1f69d4a7e scope styles to masthead, not homepage 2014-01-22 15:37:05 -06:00
Mark Otto
317aa8092d spacing 2014-01-20 22:11:51 -06: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
Mark Otto
a521e982d5 Merge pull request #12281 from XhmikosR/vendor 
Move docs third-party libraries to a separate folder.
 2014-01-18 11:42:34 -08:00
Mark Otto
7b42103df6 kill bottom margin on last docs section 2014-01-18 11:33:50 -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
78e81a1de9 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	docs/assets/css/pack.min.css
 2014-01-15 16:25:29 -08:00
Mark Otto
7e7264e224 fix ad placement 2014-01-15 16:25:04 -08:00
Julian Thilo
95f24dca9a Fix customizer's toggle buttons' margin 2014-01-16 01:19:00 +01:00
Mark Otto
6986bdb2a7 Fix page headers 2014-01-15 15:01:41 -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
c4b41ceae3 header masthead changes 2014-01-13 22:59:09 -08:00
Mark Otto
b776749507 make page headers like masthead 2014-01-13 22:54:22 -08: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
aff64cffce avoid redundant banner in minified docs CSS 2014-01-13 21:31:40 -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
4b1ff7fa49 Formatting and docs changes 2014-01-12 00:04:24 -08:00
Mark Otto
36aa3afb4f Improve spacing and alignment of sections and their headings 2014-01-11 23:15:37 -08:00
Mark Otto
613a95d838 brand guidelines cleanup 2014-01-11 19:42:10 -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
Chris Rebert
39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -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
9b71314fd8 Turn advanced optimizations off until it's fixed in clean-css. 2014-01-08 13:41:17 +02:00
XhmikosR
f00bbdd994 Minify docs CSS too. 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
Chris Rebert
9fa2c95d78 make CSSLint happier; refs #12094 2014-01-05 21:29:26 -08: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
9f44f17057 updates to homepage 2014-01-02 10:54:10 -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
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
905adb5b83 fix homepage images 2013-12-31 13:56:20 -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
Mark Otto
3abfe029ea vertically center ad 2013-07-18 13:35:55 -07:00
Mark Otto
a34470ac5d Merge branch 'bs3_old_docs_callout' into bs3_rc1 2013-07-18 13:07:49 -07:00
Mark Otto
9425382376 Merge branch 'bs3_add_ads' into bs3_rc1 2013-07-18 13:07:17 -07:00
Mark Otto
64efa86036 for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions 2013-07-18 02:19:13 -07:00
Mark Otto
3ed05f60fd Quick pass at new touch and favicons 2013-07-18 02:05:41 -07:00
Mark Otto
6e04925328 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 01:25:28 -07:00
Mark Otto
e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
fat
6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-18 01:08:19 -07:00
fat
4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
Mark Otto
181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
fat
37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto
f757cf4cf3 run make on mixin changes from #8380 2013-07-18 00:50:57 -07:00
Mark Otto
8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto
79a10feb7a Fixes #8452: adds .active to table classes 2013-07-18 00:10:22 -07:00
Mark Otto
87adbf7aa4 make on collapse changes 2013-07-17 23:56:38 -07:00
Mark Otto
bc79f8a399 Bump tooltips to use @font-size-small (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto
e57758cbb4 Drop .nav-header for .dropdown-header 
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
 2013-07-17 23:54:09 -07:00
Mark Otto
4d73aa60f9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 23:34:31 -07:00
Mark Otto
d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto
ba0c6cd57c make on prev js changes 2013-07-17 23:33:34 -07:00
fat
8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
Mark Otto
d7d1c2a767 add ads to v3 docs 2013-07-17 23:22:28 -07:00
Mark Otto
3ad0cf9e94 add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post 2013-07-17 22:58:49 -07:00
Mark Otto
9efba239b6 Merge pull request #8511 from twitter/bs3_remove_examples 
BS3: Move examples to @twbs/bootstrap-examples
 2013-07-17 22:17:30 -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