aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-02-04 00:27:12 -0800
committerMark Otto <[email protected]>2014-02-04 00:27:12 -0800
commit9ba49426e972391bc4cbd42896baeb18b88ebd69 (patch)
tree42a0b17c72d8839fa3e7bfd6c0ed75199899ff09
parentec6c9d28240aa4ef32b13be51943f98c00f3437e (diff)
parent48118576f1cc22b0dc72e897139fd0724e97af9d (diff)
downloadbootstrap-9ba49426e972391bc4cbd42896baeb18b88ebd69.tar.xz
bootstrap-9ba49426e972391bc4cbd42896baeb18b88ebd69.zip
Merge pull request #12466 from XhmikosR/12457
Add examples/css in the csslint task.
-rw-r--r--Gruntfile.js3
-rw-r--r--docs/examples/blog/blog.css4
-rw-r--r--docs/examples/grid/grid.css2
-rw-r--r--docs/examples/justified-nav/justified-nav.css2
-rw-r--r--docs/examples/non-responsive/non-responsive.css2
5 files changed, 5 insertions, 8 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index b5bd4bc78..f57e2e8ef 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -82,7 +82,8 @@ module.exports = function (grunt) {
src: [
'dist/css/bootstrap.css',
'dist/css/bootstrap-theme.css',
- 'docs/assets/css/docs.css'
+ 'docs/assets/css/docs.css',
+ 'docs/examples/**/*.css'
]
},
diff --git a/docs/examples/blog/blog.css b/docs/examples/blog/blog.css
index 82ba9d0d5..7255823ce 100644
--- a/docs/examples/blog/blog.css
+++ b/docs/examples/blog/blog.css
@@ -41,9 +41,6 @@ h6, .h6 {
}
/* Nav links */
-.blog-nav {
-
-}
.blog-nav-item {
position: relative;
display: inline-block;
@@ -65,7 +62,6 @@ h6, .h6 {
position: absolute;
bottom: 0;
left: 50%;
- display: block;
content: " ";
width: 0;
height: 0;
diff --git a/docs/examples/grid/grid.css b/docs/examples/grid/grid.css
index 963b128e3..d26744b2a 100644
--- a/docs/examples/grid/grid.css
+++ b/docs/examples/grid/grid.css
@@ -17,8 +17,8 @@ h4 {
padding-top: 15px;
padding-bottom: 15px;
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);
}
diff --git a/docs/examples/justified-nav/justified-nav.css b/docs/examples/justified-nav/justified-nav.css
index baf0e1130..2a9b05d5b 100644
--- a/docs/examples/justified-nav/justified-nav.css
+++ b/docs/examples/justified-nav/justified-nav.css
@@ -40,8 +40,8 @@ body {
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Chrome 10+,Safari 5.1+ */
background-image: -o-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Opera 11.10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
}
.nav-justified > .active > a,
.nav-justified > .active > a:hover,
diff --git a/docs/examples/non-responsive/non-responsive.css b/docs/examples/non-responsive/non-responsive.css
index 9813bb9fe..a74e3cbb8 100644
--- a/docs/examples/non-responsive/non-responsive.css
+++ b/docs/examples/non-responsive/non-responsive.css
@@ -37,8 +37,8 @@ body {
padding-top: 15px;
padding-bottom: 15px;
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);
}