mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
Merge branch 'v4' of github.com:twbs/derpstrap into v4
This commit is contained in:
commit
f2ae3ea043
10
Gruntfile.js
10
Gruntfile.js
@ -359,17 +359,9 @@ module.exports = function (grunt) {
|
||||
files: '<%= jscs.core.src %>',
|
||||
tasks: ['babel:dev']
|
||||
},
|
||||
test: {
|
||||
files: '<%= jscs.test.src %>',
|
||||
tasks: ['qunit']
|
||||
},
|
||||
sass: {
|
||||
files: 'scss/**/*.scss',
|
||||
tasks: 'sass-compile'
|
||||
},
|
||||
docs: {
|
||||
files: 'docs/assets/scss/*.scss',
|
||||
tasks: 'sass:docs'
|
||||
tasks: ['sass-compile', 'postcss:core', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs', 'docs-css', 'clean:docs', 'copy:docs']
|
||||
}
|
||||
},
|
||||
|
||||
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css.map
vendored
2
dist/css/bootstrap.min.css.map
vendored
File diff suppressed because one or more lines are too long
@ -14,11 +14,7 @@
|
||||
</title>
|
||||
|
||||
<!-- 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">
|
||||
{% endif %}
|
||||
|
||||
<!-- Documentation extras -->
|
||||
<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
|
||||
|
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css.map
vendored
2
docs/dist/css/bootstrap.min.css.map
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user