2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Commit Graph

3916 Commits

Author SHA1 Message Date
Chris Rebert bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Julian Thilo 8fd177bfa7 Fix #12073: Consistent order of variations
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Julian Thilo 8d903fbd02 duh, missed one more file
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07 01:27:49 +01: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 f389111e68 justify text 2014-01-06 09:26:08 -08:00
juniorconte 7722ab5566 notes from .input-block-level 2014-01-06 11:41:15 -02:00
Chris Rebert bbe5041cbf Merge pull request #12116 from twbs/pacify-csslint
make CSSLint happier
2014-01-05 23:44:17 -08:00
Mark Otto a5e29a8f34 link 2014-01-05 23:43:13 -08:00
Mark Otto 745bec59cf Move homepage examples to data file 2014-01-05 23:37:14 -08:00
Mark Otto 9421f0af82 Merge branch 'master' into docs_derp
Conflicts:
	docs/_layouts/default.html
	docs/_layouts/home.html
2014-01-05 23:23:55 -08:00
Mark Otto 5b7f508c60 Merge pull request #12107 from twbs/same-footer-links
harmonize footer links on homepage & docs pages
2014-01-05 23:21:11 -08:00
Mark Otto 3e54be9ae6 Merge branch 'master' into docs_derp
Conflicts:
	docs/components.html
2014-01-05 23:19:34 -08:00
wangsai ed8ef84597 fix the paragraph outside of '.bs-docs-section' 2014-01-06 14:39:09 +08:00
Chris Rebert 9fa2c95d78 make CSSLint happier; refs #12094 2014-01-05 21:29:26 -08:00
Mark Otto 0593a20638 grammarghhhhhhhhhhhh 2014-01-05 20:54:31 -08:00
Mark Otto 12dacee313 copy 2014-01-05 20:53:40 -08:00
Quy Ton c613143638 Delete reference to a non-existent class 2014-01-05 20:08:37 -08:00
Mark Otto 78e6036c68 Merge branch 'master' into docs_derp 2014-01-05 17:50:07 -08:00
Mark Otto ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Mark Otto 990303ab54 Merge pull request #12110 from twbs/one-control-per-input-group
document single .form-control per .input-group limitation
2014-01-05 15:57:33 -08:00
Chris Rebert 6684005f63 document single .form-control per .input-group limitation; fixes #12109 2014-01-05 14:44:48 -08:00
Chris Rebert 5fc434c5f1 harmonize footer links on homepage & docs pages 2014-01-05 13:45:56 -08:00
Mark Otto 1d0bf580c9 Use mix of medium and small grid clases on dashboard example 2014-01-05 13:26:15 -08:00
Chris Rebert ae255447f2 add .container(-fluid) to remaining navbar examples for consistency/accuracy
follow-up to 93a4d6cc5e
2014-01-05 12:55:03 -08:00
Chris Rebert 41257fe794 Merge pull request #12104 from ghoullier/master
Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet
2014-01-05 11:47:00 -08:00
Gregory HOULLIER a53cf55be2 Replace getElementsByTag by querySelector for IE10 Mobile plateform. 2014-01-05 20:15:48 +01:00
Quy Ton 3e92ab0149 Fix typos 2014-01-05 08:38:32 -08:00
Quy Ton 82ed81fddf Fix typo 2014-01-04 21:35:06 -08:00
Quy Ton a617c805f2 Fix anchor links 2014-01-04 09:28:56 -08:00
Quy Ton 11f56bbb7b Use relative URLs 2014-01-04 09:10:02 -08:00
Chris Rebert 84c33a822d Replace lingering page.url instance with site.baseurl
Refs #12083 & #12037
2014-01-03 16:19:20 -08:00
Mark Otto 0b75e2d738 Merge branch 'master' into docs_derp 2014-01-03 13:18:12 -08:00
Chris Rebert 007d61cfad flip order so sentence reads better 2014-01-03 12:29:45 -08:00
Chris Rebert 56b5f5b353 de-emphasize /docs/assets and docs HTML now that they're outside of the root dir 2014-01-03 12:21:38 -08:00
Quy Ton 63df2ced6e Update source code download structure 2014-01-03 11:42:27 -08:00
Quy Ton a53779d020 Refer to popovers instead of tooltips. 2014-01-03 10:55:06 -08: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
Mark Otto c583b79655 Merge pull request #12055 from wangsai/fix-assets-links-of-examples
fix assets links in all examples
2014-01-01 12:02:28 -08:00
Zlatan Vasović 1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
wangsai e4508bb37c fix assets links in all examples 2014-01-01 22:29:13 +08: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 83d26de6d5 Fix broken JS 2013-12-31 17:47:16 -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 70b8b330f0 no more page.base_url 2013-12-28 23:08:46 -08:00
Mark Otto f10cf21a8f Streamline copy process by not bringing over full files into docs/dist/, only take minified ones 2013-12-28 23:05:02 -08:00
Mark Otto a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Mark Otto 3fdde76b74 don't be repetitive on homepage 2013-12-25 14:32:00 +02:00