Chris Rebert
9eab6ffd1c
Merge pull request #12147 from ZDroid/double
...
Drop redundant 'the'
2014-01-07 14:02:45 -08:00
Zlatan Vasović
ec594887fe
Drop redundant 'the'
2014-01-07 22:40:23 +01: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
Chris Rebert
5f328dce88
Merge pull request #12057 from ZDroid/nl
...
'use strict' on new line
2014-01-07 00:31:27 -08:00
Chris Rebert
5e39e6c9d0
Merge pull request #12135 from leoj3n/patch-2
...
Improve wording in CONTRIBUTING.md
2014-01-07 00:27:54 -08:00
Joel Kuzmarski
3661c4b8ff
Improve wording in CONTRIBUTING.md
...
Parts of the "Pull requests" section are strangely worded.
This commit fixes that.
2014-01-07 02:11:07 -06:00
Chris Rebert
0a09dd46cb
Merge pull request #12133 from leoj3n/patch-1
...
Fix bad anchor link in CONTRIBUTING.md
2014-01-06 23:55:17 -08:00
Joel Kuzmarski
483974695c
Fix bad anchor link in CONTRIBUTING.md
...
Hey look, I'm contributing to CONTRIBUTING.md!
This anchor must have been overlooked while updating the docs in a previous commit. Expected behavior: scroll the document to a linked section. Experienced behavior: nada.
This proposed file change renames the anchor text from `coding conventions` to `coding guidelines` and changes the anchor link from `#code-conventions` to `#code-guidelines`.
2014-01-07 01:45:33 -06:00
Julian Thilo
158a2394a2
Merge branch 'master' of https://github.com/twbs/bootstrap
2014-01-07 01:30:16 +01:00
Julian Thilo
8d903fbd02
duh, missed one more file
...
X-Ref: 7fcfe61f4d
2014-01-07 01:27:49 +01:00
Julian Thilo
c42b6a3f8b
missed a file
...
X-Ref: 7fcfe61f4d
2014-01-07 01:22:13 +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
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
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
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
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
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
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