Chris Rebert
1736bcb05c
Merge pull request #12150 from twbs/extract-from-gruntfile
...
cleanup Gruntfile by extracting executable code
2014-01-08 11:01:03 -08:00
Julian Thilo
24c16d9904
Merge pull request #12155 from Dudytz/master
...
updated path docs-assets to docs/assets
2014-01-08 08:20:18 -08:00
Eduardo
9f0afd57f0
updated path docs-assets to docs/assets
2014-01-08 16:43:56 +01:00
XhmikosR
d06d61dc12
Use single quotes in the jqueryCheck too.
2014-01-08 13:41:17 +02: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
Mark Otto
692eb554aa
Merge pull request #12151 from wangsai/no-preboot
...
no preboot
2014-01-08 00:52:51 -08:00
wangsai
7e16425acb
no preboot
2014-01-08 16:22:50 +08:00
Chris Rebert
d7a128c636
extract glyphicons.yml generator out of Gruntfile into separate module
2014-01-07 22:34:09 -08:00
Chris Rebert
d1c29af591
extract raw-files.js generator out of Gruntfile into separate module
2014-01-07 22:16:52 -08:00
Chris Rebert
b67fc6906a
Merge pull request #12149 from twbs/bump-grunt-contrib-less
...
bump grunt-contrib-less to v0.9.0
2014-01-07 20:05:09 -08:00
Chris Rebert
9ae5d321b5
bump grunt-contrib-less to v0.9.0
2014-01-07 19:50:58 -08:00
Chris Rebert
a712abd06e
enable CSSLint in test suite; fixes #12094
2014-01-07 19:34:49 -08: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
Chris Rebert
bf5017c01c
fix #12143
2014-01-07 17:08:40 -08:00
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
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
