0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00

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

This commit is contained in:
Jacob Thornton 2015-08-12 21:12:23 -07:00
commit f2ae3ea043
6 changed files with 5 additions and 17 deletions

View File

@ -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 diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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 diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long