diff options
| author | Mark Otto <[email protected]> | 2013-12-31 13:53:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-31 13:53:33 -0800 |
| commit | b253cb2c1e34a41940c4933fb95c46da833fc5f9 (patch) | |
| tree | e5a40b963eba273c42e4aad21fb3858a657002dd /examples/theme/theme.css | |
| parent | 9e1153d0498a9e9612c1db85922642fe2aa38c2a (diff) | |
| parent | 8812856de1ce17bb2f482c75370fb2e3db7ac6de (diff) | |
| download | bootstrap-b253cb2c1e34a41940c4933fb95c46da833fc5f9.tar.xz bootstrap-b253cb2c1e34a41940c4933fb95c46da833fc5f9.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
Diffstat (limited to 'examples/theme/theme.css')
| -rw-r--r-- | examples/theme/theme.css | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/examples/theme/theme.css b/examples/theme/theme.css deleted file mode 100644 index e7559231e..000000000 --- a/examples/theme/theme.css +++ /dev/null @@ -1,14 +0,0 @@ -body { - padding-top: 70px; - padding-bottom: 30px; -} - -.theme-dropdown .dropdown-menu { - display: block; - position: static; - margin-bottom: 20px; -} - -.theme-showcase > p > .btn { - margin: 5px 0; -}
\ No newline at end of file |