Mark Otto
2f7b04a192
Reorder the Gruntfile a bit
2014-03-09 16:09:36 -07:00
XhmikosR
9d027d2bee
Remove unneeded quotes.
2014-03-09 11:10:52 +02:00
Zlatan Vasović
e4c9492ad9
Rename generateRawFilesJs to generateRawFiles
2014-03-08 10:54:41 +01:00
Chris Rebert
b9a0d1e4cd
Merge pull request #12505 from ZDroid/js-cs-hint
...
Reorganize docs assets
2014-03-07 08:47:09 -08:00
Zlatan Vasović
d08bbdc6ec
Reorganize docs assets
2014-03-07 17:37:23 +01:00
Bas Bosman
de27e729da
Do csscomb earlier in build phase
2014-03-07 13:39:07 +01:00
Bas Bosman
cb7eb674ac
Add autoprefixer
2014-03-07 09:01:54 +01:00
XhmikosR
73ad81d89c
Add time-grunt plugin.
2014-03-07 08:47:23 +02:00
Chris Rebert
310465b035
re-enable requireCamelCaseOrUpperCaseIdentifiers in JSCS & use null
to override it for Gruntfile
2014-03-06 13:15:32 -08:00
Chris Rebert
56a5d93b82
switch to grunt-css-flip for RTL CSS generation
2014-03-06 12:31:28 -08:00
XhmikosR
d7dc8a7bd3
Merge pull request #12853 from twbs/jscs
...
Switch to JSCS
2014-03-05 08:42:50 +02:00
Mark Otto
559b90f944
Rename RTL files and add some basic docs
2014-03-03 23:50:04 -08:00
Mark Otto
587814f16e
Simplify gruntfile more to remove theme RTL
2014-03-03 22:49:43 -08:00
Mark Otto
4dd7b4bd87
Don't RTL the theme file--no need
2014-03-03 21:54:07 -08:00
Mark Otto
af39290a9d
Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
...
Conflicts:
Gruntfile.js
package.json
test-infra/npm-shrinkwrap.canonical.json
2014-03-03 21:52:56 -08:00
XhmikosR
cd134f1ed6
Merge pull request #12864 from twbs/csslint-fix
...
Csslint fix
2014-03-02 09:50:21 +02:00
XhmikosR
055730d84e
Gruntfile.js: use the same targets as JSHint for JSCS to avoid duplication.
2014-02-28 17:30:08 +02:00
XhmikosR
c586a56d57
Move immed
to JSCS.
2014-02-28 17:30:08 +02:00
XhmikosR
299f985e5d
Gruntfile.js: Remove extra comma.
2014-02-28 17:29:36 +02:00
XhmikosR
a7339a0f4c
Move csslint overrides in Gruntfile.js.
...
This works around https://github.com/gruntjs/grunt-contrib-csslint/issues/26
2014-02-27 11:39:30 +02:00
XhmikosR
05ccc185d9
Break csslint targets.
2014-02-27 11:15:32 +02:00
XhmikosR
2ef9f9b213
Run csscomb before cssmin.
2014-02-27 10:52:30 +02:00
XhmikosR
8ff7e64359
Add docs.css in the CSSComb task.
2014-02-27 10:12:52 +02:00
XhmikosR
63031a3ca5
Bump grunt-jscs-checker.
2014-02-26 19:32:43 +02:00
Chris Rebert
e40c1e5e6d
add Grunt task for css-flip-ing & add RTL to Gruntfile configs
2014-02-25 10:31:02 -08:00
XhmikosR
db32afe6cf
Update grunt-contrib-cssmin.
2014-02-18 07:40:02 +02:00
XhmikosR
5796b56d96
Switch to the minified JSZip.
2014-02-12 20:50:47 +02:00
Chris Rebert
1e1f510294
rm BrowserStack testing from build
2014-02-11 10:11:38 -08:00
Zlatan Vasović
ba4206b644
Use different coding style for Gruntfile
...
Fixes #12657
2014-02-10 11:15:08 -08:00
Chris Rebert
9afead3fb0
fix indentation in Gruntfile
2014-02-10 11:09:59 -08:00
Zlatan Vasović
938779ca93
Move jade files to docs/jade/
2014-02-08 22:29:06 +01:00
Chris Rebert
f07423511d
Merge pull request #12648 from ZDroid/index.html-only
...
Replace wildcard with file name
2014-02-07 12:44:51 -08:00
Zlatan Vasović
54aece3458
Replace wildcard with file name
2014-02-07 20:48:12 +01:00
Zlatan Vasović
aead10fafa
Avoid setting jshint node: true
in every Grunt JS file
2014-02-07 13:34:17 +01:00
XhmikosR
119ed54bd1
Merge pull request #12605 from ZDroid/license-object
...
Use license object instead of licenses array
2014-02-06 21:04:36 +02:00
Zlatan Vasović
9bb5c319b8
Update grunt paths
2014-02-06 19:39:45 +01:00
Zlatan Vasović
96fd2dca02
Use license object instead of licenses array
2014-02-06 11:37:39 +01:00
Chris Rebert
46f9d27142
reorganize all grunt tasks into one directory
...
also fixes #12581
2014-02-04 13:18:54 -08:00
Mark Otto
ef3c560a06
Reorder grunt dist tasks to ensure JS gets copied over
2014-02-04 02:04:23 -08:00
XhmikosR
aeed64d1cb
Gruntfile.js: Move common uglify properties together.
2014-02-04 11:14:20 +02:00
XhmikosR
9f668a5573
Add examples/**/*.css in csscomb task.
2014-02-04 10:39:02 +02:00
XhmikosR
3a89fbc9a3
Add examples/**/*css in the csslint task.
...
Fixes #12457 .
2014-02-04 09:04:40 +02:00
Chris Rebert
d99d79d2e8
fix #12531
2014-02-02 21:38:37 -08:00
Chris Rebert
623d650758
most of Bootstrap's components are pure CSS and thus don't require jQuery
...
Refs https://news.ycombinator.com/item?id=7156305
2014-01-31 09:50:47 -08:00
Mark Otto
80ef14a11a
Merge pull request #12423 from ZDroid/name
...
Rename pack.min.css to docs.min.css to match with docs.min.js
2014-01-29 21:44:01 -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
Chris Rebert
9ec5905c07
Merge pull request #12415 from XhmikosR/master
...
Gruntfile.js: remove unused code.
2014-01-28 17:35:09 -08:00
Zlatan Vasović
f8bb6811bd
Remove redundant jshint comment
2014-01-28 22:47:23 +01:00
XhmikosR
615f1ad4aa
Gruntfile.js: remove unused code.
2014-01-28 21:07:56 +02:00
Chris Rebert
5a3f1a90ba
fix #12261
2014-01-26 14:22:06 -08:00
Chris Rebert
3de48d29f5
fix #12280 by templating the customizer's nav sidebar too
...
The customizer is such a PITA.
2014-01-20 18:06:16 -08:00
Chris Rebert
6b8d4e9c76
clarify Grunt task licensing
2014-01-20 16:56:24 -08: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
Zlatan Vasović
956064ec56
Improve grunt config and vars
2014-01-19 22:41:01 +01:00
XhmikosR
4bca3c79b3
Move docs third-party libraries to a separate folder.
2014-01-18 08:15:21 +02:00
Chris Rebert
ffdc18cbbf
fix #12274
2014-01-17 11:52:35 -08:00
Chris Rebert
47bbc30b2c
increase Sauce concurrency
...
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-32309827
Thanks @admc & @saucelabs !
2014-01-15 15:55:47 -08:00
Chris Rebert
e2a18430f9
Merge pull request #12213 from twbs/browserstack
...
tests: run BrowserStack in parallel with Sauce Labs
2014-01-14 20:44:47 -08:00
Chris Rebert
3a97697456
tests: run BrowserStack in parallel with Sauce Labs
...
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701 .
2014-01-14 14:13:52 -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
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
685fe722c2
preserve third-party attribution comments when minifying docs JS
2014-01-13 17:00:26 -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
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
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
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
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
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
bf5017c01c
fix #12143
2014-01-07 17:08:40 -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
938bc12c58
add /docs/assets JS to JSCS Grunt task config
2014-01-05 20:52:37 -08:00
Zlatan Vasović
0cc4fe6ee3
Drop trailling comma
...
No need for it.
2014-01-02 15:46:13 +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
e3aa358696
derp
2013-12-31 13:57:35 -08:00
Mark Otto
ac3f48bb19
Fixes #12046 : move .csscomb.json and .csslintrc to less/ folder
2013-12-31 13:16:28 -08:00
Mark Otto
78e1af58d6
typo
2013-12-31 11:57:44 -08:00
Mark Otto
b43371cd0a
@nschonni's feedback <3
2013-12-31 11:38:32 -08:00
Mark Otto
1e4540f11b
@cvrebert's feedback
2013-12-31 10:51:39 -08:00
Mark Otto
0df96d8c32
Merge branch 'master' into docs_dir
2013-12-31 10:38:31 -08:00
Chris Rebert
990c2392e5
mv sauce_browsers.yml out of the project root
2013-12-29 20:25:40 -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
Zlatan Vasović
0016b508cb
Merge two fs variable declarations into one
...
One is enough.
2013-12-28 23:33:32 +01:00
Mark Otto
567dc12e86
Fixes #12012 : Use correct banner in docs js
2013-12-26 19:08:19 -08:00
XhmikosR
5eab9cbe82
Add docs-assets/css/docs.css to csslint too.
2013-12-26 19:49:33 +02:00
Zlatan Vasović
608926e808
Improve banner
2013-12-23 18:02:42 +01:00
Mark Otto
ec13eb8d38
Remove timestamp on generated Glyhpicons
2013-12-22 21:05:08 -08:00
Ross Allen
b048ea545f
Write Glyphicons to _data, generate Glyphicons markup
...
This generates a glyphicons.yml file from the glyphicons.less source,
and then components.html uses that data to generate the Glyphicons docs
by iterating through the data. The _data directory was introduced in
Jekyll 1.3.0, and GitHub Pages is already on [version 1.4.2][1].
Fixes #11862 .
[1] https://github.com/github/pages-gem/blob/master/github-pages.gemspec#L16
2013-12-18 20:15:51 -08:00
Mark Otto
40651cf1ea
more license mentions
2013-12-18 15:08:16 -08:00
Mark Otto
1bc8607bdf
Merge branch 'master' into css-source-maps
...
Conflicts:
Gruntfile.js
2013-12-18 10:22:18 -08:00
Chris Rebert
dcfe710fa4
enable failHard grunt-html-validation option; fixes #11876
2013-12-17 01:35:16 -08:00
Chris Rebert
0f72123c43
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16 00:42:45 -08:00
Chris Rebert
43c3d785ef
explicitly set more HTML5 validator options
2013-12-15 19:42:47 -08:00
Mark Otto
55f6beb427
Merge branch 'master' into pr/11776
...
Conflicts:
package.json
2013-12-15 14:09:50 -08:00
Chris Rebert
39a2dab722
parallelize Travis using build matrix & test subsuites
2013-12-14 19:11:04 -08:00
Chris Rebert
56d89ed7ae
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12 21:58:44 -08:00
Tobias Lindig
3583aa2774
correct indentation
2013-12-10 14:47:50 +01:00
Tobias Lindig
9f12f840b9
Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json
2013-12-10 10:28:44 +01:00
Chris Rebert
95992ef7e9
enable strictMath in grunt-contrib-less config
2013-12-09 16:27:42 -08:00
Chris Rebert
9e38e25534
enable CSS source maps in grunt-contrib-less
2013-12-09 14:29:19 -08:00
Mark Otto
d466d527a4
Undo merge of #11778 and use cleancss min option
2013-12-09 00:12:11 -08:00
Mark Otto
de218bbba8
Merge branch 'pr/11779' into drop_recess_for_less
...
Conflicts:
Gruntfile.js
package.json
2013-12-08 23:56:22 -08:00
Mark Otto
ea61a19a04
Merge branch 'pr/11778' into drop_recess_for_less
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
2013-12-08 23:48:07 -08:00
Mark Otto
4540f9e2d2
derp, don't sort min /cc @cvrebert
2013-12-08 22:16:43 -08:00
Mark Otto
aae9c2d136
merge, compile
2013-12-08 22:11:46 -08:00
Chris Rebert
dbe95f027d
fixups to csscomb grunt task
2013-12-08 20:46:12 -08:00
Mark Otto
f1cb57c8c2
restore original options value
2013-12-08 19:12:37 -08:00
Mark Otto
c0200426ee
Drop grunt-recess for grunt-contrib-less & co
2013-12-08 19:09:27 -08:00
XhmikosR
cbfbf1b2dd
Add csslint support.
2013-12-08 13:23:25 +02:00
XhmikosR
fdc5d1dc34
Minify css with clean-css.
2013-12-08 13:05:10 +02:00
XhmikosR
eca8ff3803
Use single quotes consistently.
2013-12-08 12:44:14 +02:00
Zlatan Vasović
0c457d48f8
Drop redundant module import
2013-12-08 11:24:47 +01:00
Mark Otto
ed63dfd8d3
Merge pull request #11739 from XhmikosR/lint-assets
...
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-08 02:16:16 -08:00
XhmikosR
2fc2fe75bd
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-07 05:05:13 +02:00
Chris Rebert
c1dae1e13c
integrate JSCS
2013-12-06 17:26:07 -08:00
Chris Rebert
351f86e1db
fix some JS to pass jscs
2013-12-06 17:23:45 -08:00
XhmikosR
3de4f23ea2
Minify docs-assets too.
2013-12-06 11:25:29 +02:00
Chris Rebert
bd9332a58a
switch to Sauce Labs for our cross-browser JS unit testing needs
...
Fixes #11087
2013-12-03 21:57:22 -08:00
Tobias Lindig
5a826a65b2
Gruntfile.js: Set line feed char to '\n' to get same result on all platforms.
2013-12-03 10:49:37 -08:00
Zlatan Vasović
ab87085625
Use pkg.homepage
2013-11-30 16:11:41 +01:00
Mark Otto
a7a9dcaeb2
Alternate fix for #11303 : add link to site in banner and remove @mdo and @fat usernames from it
2013-11-30 00:42:36 -08:00
Zlatan Vasović
9a8a571ad1
Fix some weird indents
2013-11-17 10:24:31 +01:00
Chris Rebert
0bb122a377
add Grunt task to change version numbers; fixes #11332
2013-11-04 11:22:30 -08:00
Zlatan Vasović
20cba845c2
Add another newline to improve final code readability
...
This divides banner from code.
2013-10-26 10:57:09 +02:00
Chris Rebert
54cd0f8c2f
rm dummy 'src' attributes of <img>s & squelch validator warning; fixes #11216
2013-10-23 23:41:17 -07:00
Chris Rebert
0d122fc323
silence validator regarding http-equiv="X-UA-Compatible"
2013-10-23 23:25:17 -07:00
Chris Rebert
a388b7906e
Merge pull request #10956 from ZDroid/patch-4
...
Sort tasks alphabetically
2013-10-09 18:31:17 -07:00
Chris Rebert
f9ed8e6f00
trivial refactor in build-customizer grunt task
2013-10-09 18:03:08 -07:00
herom
aad70834fc
Fixes #9925 : convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts.
...
Merges #9982
2013-10-09 18:03:04 -07:00
Zlatan Vasović
146cd38867
Sort tasks alphabetically
2013-10-05 21:17:49 +02:00
Zlatan Vasović
dc5625c85b
Indent banner to match the *'s
2013-10-02 14:33:17 +02:00
Chris Rebert
362c9c9f89
rm unnecessary backslashes from jqueryCheck
2013-09-29 15:37:22 -07:00
Dean Taylor
429e92fd58
Update Gruntfile.js fixing undefined jQuery check
...
The check to see if jQuery was defined as incorrect causing the "Bootstrap requires jQuery" message to only be displayed if jQuery is defined and has a value which equates to `false`.
2013-09-29 21:14:24 +01:00
Dean Taylor
f39db19306
Update Gruntfile.js removing pointless reading of customize.html.
...
I couldn't see a reason to read "customize.html", removed line.
2013-09-27 18:17:02 +01:00
Chris Rebert
8aa5181126
move /assets/ to /docs-assets/ ; fixes #10715
2013-09-23 13:02:26 -07:00
XhmikosR
b741608964
Show minification report for uglify-js.
2013-09-19 08:33:52 +03:00
Chris Rebert
2b5d7d23d0
generate CSS banners via Gruntfile; fixes #10101
2013-09-10 19:22:20 -07:00
Chris Rebert
76d8757b0a
rm period from licensing header so it's not mistaken as part of the URL
2013-09-10 19:01:40 -07:00
Mark Otto
48d929d69e
Use jekyll var for current version in docs; update banner in gruntfile to match .less banner
2013-08-23 22:38:51 -07:00
fat
b6ddaf63d6
fix customizer
2013-08-19 14:16:52 -07:00