aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-12-26 12:32:34 -0800
committerChris Rebert <[email protected]>2013-12-26 12:32:34 -0800
commite4b036d278d5e11d6c9fcdfd78a2bae78d281e4f (patch)
tree2b18d1fe8ac601f805101f7b2d19236eb636d7f9
parent1e938f17810490c0bfed6039fd23dfcd91afcb58 (diff)
parent5eab9cbe82f90087516a7c45b2b01a58e3c037c8 (diff)
downloadbootstrap-e4b036d278d5e11d6c9fcdfd78a2bae78d281e4f.tar.xz
bootstrap-e4b036d278d5e11d6c9fcdfd78a2bae78d281e4f.zip
Merge pull request #12021 from XhmikosR/master
Add docs-assets/css/docs.css to csslint too.
-rw-r--r--Gruntfile.js6
-rw-r--r--docs-assets/css/docs.css3
2 files changed, 7 insertions, 2 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index ef4d6855e..1feff2233 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -64,7 +64,11 @@ module.exports = function (grunt) {
options: {
csslintrc: '.csslintrc'
},
- src: ['dist/css/bootstrap.css', 'dist/css/bootstrap-theme.css']
+ src: [
+ 'dist/css/bootstrap.css',
+ 'dist/css/bootstrap-theme.css',
+ 'docs-assets/css/docs.css'
+ ]
},
concat: {
diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css
index f528251af..8a2f89c06 100644
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -32,6 +32,7 @@
* Miscellaneous
*/
+/*csslint ids: false, fallback-colors: false*/
/*
* Scaffolding
@@ -668,8 +669,8 @@ h1[id] {
padding-top: 10px;
padding-bottom: 10px;
background-color: #eee;
- border: 1px solid #ddd;
background-color: rgba(86,61,124,.15);
+ border: 1px solid #ddd;
border: 1px solid rgba(86,61,124,.2);
}