0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

91 Commits

Author SHA1 Message Date
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