diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
| commit | e9199718d64dadc22d61b4cea8c77a2307455823 (patch) | |
| tree | b10f0174a9d564da40df55d658136fef74b6adb9 /docs/examples/theme/theme.css | |
| parent | 4787a69efbe0fcd81228781b3c91dfe198aa0f1b (diff) | |
| parent | 7f88009394e72395aa7a458ae442b0c3037dbd15 (diff) | |
| download | bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.tar.xz bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.zip | |
Merge branch 'master' into fix-12154
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/examples/theme/theme.css')
| -rw-r--r-- | docs/examples/theme/theme.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/examples/theme/theme.css b/docs/examples/theme/theme.css index e7559231e..181f99842 100644 --- a/docs/examples/theme/theme.css +++ b/docs/examples/theme/theme.css @@ -4,11 +4,11 @@ body { } .theme-dropdown .dropdown-menu { - display: block; position: static; + display: block; margin-bottom: 20px; } .theme-showcase > p > .btn { margin: 5px 0; -}
\ No newline at end of file +} |