Commit f2ae3ea0 authored by Jacob Thornton's avatar Jacob Thornton
Browse files

Merge branch 'v4' of github.com:twbs/derpstrap into v4

parents 11abb0f7 3406e2fd
Showing with 1 addition and 13 deletions
+1 -13
...@@ -359,17 +359,9 @@ module.exports = function (grunt) { ...@@ -359,17 +359,9 @@ module.exports = function (grunt) {
files: '<%= jscs.core.src %>', files: '<%= jscs.core.src %>',
tasks: ['babel:dev'] tasks: ['babel:dev']
}, },
test: {
files: '<%= jscs.test.src %>',
tasks: ['qunit']
},
sass: { sass: {
files: 'scss/**/*.scss', files: 'scss/**/*.scss',
tasks: 'sass-compile' tasks: ['sass-compile', 'postcss:core', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs', 'docs-css', 'clean:docs', 'copy:docs']
},
docs: {
files: 'docs/assets/scss/*.scss',
tasks: 'sass:docs'
} }
}, },
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -14,11 +14,7 @@ ...@@ -14,11 +14,7 @@
</title> </title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
{% if jekyll.environment == "development" %}
<link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
{% else %}
<link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
{% endif %}
<!-- Documentation extras --> <!-- Documentation extras -->
<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet"> <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment