diff --git a/Gruntfile.js b/Gruntfile.js
index dff1fadb9..fc2700cff 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -218,24 +218,25 @@ module.exports = function (grunt) {
}
},
- csslint: {
+ stylelint: {
options: {
- csslintrc: 'less/.csslintrc'
+ configFile: 'grunt/.stylelintrc',
+ formatter: 'string',
+ ignoreDisables: false,
+ failOnError: true,
+ outputFile: '',
+ reportNeedlessDisables: false,
+ syntax: ''
},
dist: [
- 'dist/css/bootstrap.css',
- 'dist/css/bootstrap-theme.css'
+ 'less/**/*.less'
+ ],
+ docs: [
+ 'docs/assets/less/**/*.less'
],
examples: [
'docs/examples/**/*.css'
- ],
- docs: {
- options: {
- ids: false,
- 'overqualified-elements': false
- },
- src: 'docs/assets/css/src/docs.css'
- }
+ ]
},
cssmin: {
@@ -262,28 +263,6 @@ module.exports = function (grunt) {
}
},
- csscomb: {
- options: {
- config: 'less/.csscomb.json'
- },
- dist: {
- expand: true,
- cwd: 'dist/css/',
- src: ['*.css', '!*.min.css'],
- dest: 'dist/css/'
- },
- examples: {
- expand: true,
- cwd: 'docs/examples/',
- src: '**/*.css',
- dest: 'docs/examples/'
- },
- docs: {
- src: 'docs/assets/css/src/docs.css',
- dest: 'docs/assets/css/src/docs.css'
- }
- },
-
copy: {
fonts: {
expand: true,
@@ -464,7 +443,7 @@ module.exports = function (grunt) {
if (runSubset('core') &&
// Skip core tests if this is a Savage build
process.env.TRAVIS_REPO_SLUG !== 'twbs-savage/bootstrap') {
- testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'csslint:dist', 'test-js', 'docs']);
+ testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'stylelint:dist', 'test-js', 'docs']);
}
// Skip HTML validation if running a different subset of the test suite
if (runSubset('validate-html') &&
@@ -489,7 +468,7 @@ module.exports = function (grunt) {
// CSS distribution task.
grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme', 'less:compileDocs']);
- grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'csscomb:dist', 'cssmin:minifyCore', 'cssmin:minifyTheme']);
+ grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'cssmin:minifyCore', 'cssmin:minifyTheme']);
// Full distribution task.
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js']);
@@ -514,8 +493,8 @@ module.exports = function (grunt) {
});
// Docs task.
- grunt.registerTask('docs-css', ['autoprefixer:docs', 'autoprefixer:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:minifyDocs']);
- grunt.registerTask('lint-docs-css', ['csslint:docs', 'csslint:examples']);
+ grunt.registerTask('docs-css', ['autoprefixer:docs', 'autoprefixer:examples', 'cssmin:minifyDocs']);
+ grunt.registerTask('lint-docs-css', ['stylelint:docs', 'stylelint:examples']);
grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']);
grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']);
grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']);
diff --git a/_config.yml b/_config.yml
index 67439a76b..d74da67fc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,7 +10,6 @@ source: docs
destination: _gh_pages
host: 0.0.0.0
port: 9001
-baseurl: ""
url: http://getbootstrap.com
baseurl: /docs/3.4
encoding: UTF-8
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 3b4a026de..6acc4a9f1 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -6,8 +6,8 @@
Designed and built with all the love in the world by @mdo and @fat. Maintained by the core team with the help of our contributors.
diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html
index 2249bbd70..e6ddba2db 100644
--- a/docs/_includes/js/buttons.html
+++ b/docs/_includes/js/buttons.html
@@ -16,12 +16,12 @@
For the sake of this demonstration, we are using data-loading-text and $().button('loading'), but that's not the only state you can use. See more on this below in the $().button(string) documentation.
-
{% highlight html %}
-