0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

8071 Commits

Author SHA1 Message Date
Mark Otto
f389111e68 justify text 2014-01-06 09:26:08 -08:00
Mark Otto
99338caed0 Merge pull request #12125 from juniorconte/input-block-level
notes from .input-block-level
2014-01-06 09:14:44 -08:00
juniorconte
7722ab5566 notes from .input-block-level 2014-01-06 11:41:15 -02:00
Chris Rebert
aed56fc0a6 New Year 2014-01-05 23:45:15 -08: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
Chris Rebert
422bdc50f9 Merge pull request #12118 from wangsai/fix-out-container
fix the paragraph outside of '.bs-docs-section'
2014-01-05 22:54:01 -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
Chris Rebert
938bc12c58 add /docs/assets JS to JSCS Grunt task config 2014-01-05 20:52:37 -08:00
Mark Otto
34566f4934 Merge pull request #12115 from Quy/master
Delete reference to a non-existent class
2014-01-05 20:16:17 -08:00
Quy Ton
c613143638 Delete reference to a non-existent class 2014-01-05 20:08:37 -08:00
Chris Rebert
7653b845f8 Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery
Use $ instead of jQuery
2014-01-05 18:06:55 -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
Mark Otto
9af8692307 Merge pull request #12105 from twbs/navbar-containers
add .container(-fluid) to remaining navbar examples
2014-01-05 13:19:49 -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
Chris Rebert
711d0b8337 Merge pull request #12099 from Quy/master
Fix typos
2014-01-05 08:52:16 -08:00
Quy Ton
3e92ab0149 Fix typos 2014-01-05 08:38:32 -08:00
Chris Rebert
c7eac32d3e Merge pull request #12098 from ZDroid/reorg
Group repo vars together in Jekyll config
2014-01-05 08:05:40 -08:00
Chris Rebert
055705741e Merge pull request #12097 from ZDroid/deprecated
Replace @screen-sm with @screen-sm-min
2014-01-05 08:01:55 -08:00
Zlatan Vasović
f63cd94e43 Reorganize vars 2014-01-05 11:51:49 +01:00
Zlatan Vasović
78eb8cc0f4 Replace @screen-sm with @screen-sm-min 2014-01-05 11:38:26 +01:00
Chris Rebert
b9d779a73c Merge pull request #12095 from Quy/master
Fix typo
2014-01-04 21:43:25 -08:00
Quy Ton
82ed81fddf Fix typo 2014-01-04 21:35:06 -08:00
Mark Otto
72d4fafd66 Merge pull request #12092 from Quy/master
Use relative URLs and fix anchor links
2014-01-04 19:31:52 -08:00
Chris Rebert
7ca113b487 Merge pull request #12090 from nschonni/patch-2
Quote Node 0.10 so correct version is printed
2014-01-04 12:20:38 -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
Nick Schonning
8662323cd5 Quote Node 0.10 so correct version is printed 2014-01-04 10:46:05 -05:00
Chris Rebert
84c33a822d Replace lingering page.url instance with site.baseurl
Refs #12083 & #12037
2014-01-03 16:19:20 -08:00
Kevin Sawicki
5141e4da10 Use $ instead of jQuery 2014-01-03 14:39:18 -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
Chris Rebert
096a72d897 Merge pull request #12081 from Quy/master
Update source code download structure
2014-01-03 12:14:20 -08:00
Quy Ton
63df2ced6e Update source code download structure 2014-01-03 11:42:27 -08:00
Julian Thilo
71688061b4 Merge pull request #12080 from Quy/master
Refer to popovers instead of tooltips.
2014-01-03 11:04:14 -08:00