Merge branch 'master' into pr/11744
Conflicts: dist/css/bootstrap.min.css
Showing
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
examples/cover/cover.css
0 → 100644
examples/cover/index.html
0 → 100644
35.8 KB
103 KB
js/.jscs.json
0 → 100644
| ... | @@ -32,6 +32,7 @@ | ... | @@ -32,6 +32,7 @@ |
| , "grunt-contrib-watch": "~0.5.3" | , "grunt-contrib-watch": "~0.5.3" | ||
| , "grunt-html-validation": "~0.1.6" | , "grunt-html-validation": "~0.1.6" | ||
| , "grunt-jekyll": "~0.4.0" | , "grunt-jekyll": "~0.4.0" | ||
| , "grunt-jscs-checker": "~0.2.5" | |||
| , "grunt-recess": "~0.5.0" | , "grunt-recess": "~0.5.0" | ||
| , "grunt-saucelabs": "~4.1.2" | , "grunt-saucelabs": "~4.1.2" | ||
| , "grunt-sed": "~0.1.1" | , "grunt-sed": "~0.1.1" | ||
| ... | ... |