diff options
| author | XhmikosR <[email protected]> | 2014-03-02 09:50:21 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2014-03-02 09:50:21 +0200 |
| commit | cd134f1ed6b83854bf1f327d092022cfacc1c655 (patch) | |
| tree | 505f87da1f9e2107ec62a5d46398a975058a1d08 | |
| parent | cd65e512a21767861c57294dc720d7836a104d39 (diff) | |
| parent | a7339a0f4c05f5b6a84cc457641a363e18ef2b85 (diff) | |
| download | bootstrap-cd134f1ed6b83854bf1f327d092022cfacc1c655.tar.xz bootstrap-cd134f1ed6b83854bf1f327d092022cfacc1c655.zip | |
Merge pull request #12864 from twbs/csslint-fix
Csslint fix
| -rw-r--r-- | Gruntfile.js | 14 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 2 | ||||
| -rw-r--r-- | docs/examples/cover/cover.css | 1 | ||||
| -rw-r--r-- | docs/examples/sticky-footer-navbar/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/sticky-footer-navbar/sticky-footer-navbar.css | 4 | ||||
| -rw-r--r-- | docs/examples/sticky-footer/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/sticky-footer/sticky-footer.css | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 5bc1c07ed..276052c0e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -84,10 +84,18 @@ module.exports = function (grunt) { }, src: [ 'dist/css/bootstrap.css', - 'dist/css/bootstrap-theme.css', - 'docs/assets/css/docs.css', + 'dist/css/bootstrap-theme.css' + ], + examples: [ 'docs/examples/**/*.css' - ] + ], + docs: { + options: { + 'ids': false, + 'overqualified-elements': false + }, + src: ['docs/assets/css/docs.css'] + } }, concat: { diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a554a59aa..8a82ed11e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,5 +1,3 @@ -/*csslint ids: false, overqualified-elements: false, fallback-colors: false*/ - /*! * Bootstrap Docs (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. diff --git a/docs/examples/cover/cover.css b/docs/examples/cover/cover.css index fb478ed09..9fcc9274f 100644 --- a/docs/examples/cover/cover.css +++ b/docs/examples/cover/cover.css @@ -84,6 +84,7 @@ body { .masthead-nav > li > a:hover, .masthead-nav > li > a:focus { background-color: transparent; + border-bottom-color: #a9a9a9; border-bottom-color: rgba(255,255,255,.25); } .masthead-nav > .active > a, diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index dbce0806c..9c7566ed6 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -71,7 +71,7 @@ <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p> </div> - <div id="footer"> + <div class="footer"> <div class="container"> <p class="text-muted">Place sticky footer content here.</p> </div> diff --git a/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css b/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css index 76ac2ec89..ee8038063 100644 --- a/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css +++ b/docs/examples/sticky-footer-navbar/sticky-footer-navbar.css @@ -8,7 +8,7 @@ body { /* Margin bottom by footer height */ margin-bottom: 60px; } -#footer { +.footer { position: absolute; bottom: 0; width: 100%; @@ -29,7 +29,7 @@ body > .container { margin: 20px 0; } -#footer > .container { +.footer > .container { padding-right: 15px; padding-left: 15px; } diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html index a1d30106f..5788cd5c9 100644 --- a/docs/examples/sticky-footer/index.html +++ b/docs/examples/sticky-footer/index.html @@ -37,7 +37,7 @@ <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p> </div> - <div id="footer"> + <div class="footer"> <div class="container"> <p class="text-muted">Place sticky footer content here.</p> </div> diff --git a/docs/examples/sticky-footer/sticky-footer.css b/docs/examples/sticky-footer/sticky-footer.css index 8e9adcfaa..b6699e80e 100644 --- a/docs/examples/sticky-footer/sticky-footer.css +++ b/docs/examples/sticky-footer/sticky-footer.css @@ -8,7 +8,7 @@ body { /* Margin bottom by footer height */ margin-bottom: 60px; } -#footer { +.footer { position: absolute; bottom: 0; width: 100%; |
