diff options
| author | Mark Otto <[email protected]> | 2013-08-21 14:30:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-21 14:30:27 -0700 |
| commit | 6fc988613ab8d42d937a7815f5fad3f59d5bde78 (patch) | |
| tree | 4b99dbd295239ee64532b9923ea8df4920b7e103 /examples | |
| parent | 0886fee10328d5712055c87047b8040d0e64a356 (diff) | |
| parent | aea1d8839fdfa6c517bf42719f82b56510a56d0b (diff) | |
| download | bootstrap-6fc988613ab8d42d937a7815f5fad3f59d5bde78.tar.xz bootstrap-6fc988613ab8d42d937a7815f5fad3f59d5bde78.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/justified-nav/justified-nav.css | 1 | ||||
| -rw-r--r-- | examples/non-responsive/non-responsive.css | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/examples/justified-nav/justified-nav.css b/examples/justified-nav/justified-nav.css index 7837acf40..c669d44c7 100644 --- a/examples/justified-nav/justified-nav.css +++ b/examples/justified-nav/justified-nav.css @@ -38,7 +38,6 @@ body { background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */ 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: -ms-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* IE10+ */ 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 */ diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css index 4928128e6..526b0b8be 100644 --- a/examples/non-responsive/non-responsive.css +++ b/examples/non-responsive/non-responsive.css @@ -1,7 +1,6 @@ - /* Template-specific stuff * - * Customizations just for the template—these are not necessary for anything + * Customizations just for the template; these are not necessary for anything * with disabling the responsiveness. */ |