diff options
| author | Jacob Thornton <[email protected]> | 2012-07-24 00:24:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-07-24 00:24:25 -0700 |
| commit | 5b2f2ed82181c651626b541aee6963f74bf8be31 (patch) | |
| tree | 31706cdec9278f49a03544385d45e8572af1f98f /docs/assets/css/bootstrap.css | |
| parent | 4ea7c472358e2d77f76193ed3c1bafd641dd74ae (diff) | |
| parent | 7ce048bccd618bbae794a9115861d1927664b8ed (diff) | |
| download | bootstrap-5b2f2ed82181c651626b541aee6963f74bf8be31.tar.xz bootstrap-5b2f2ed82181c651626b541aee6963f74bf8be31.zip | |
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
docs/assets/css/docs.css
docs/javascript.html
docs/templates/pages/javascript.mustache
Diffstat (limited to 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index df389af9c..5525614d6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3686,15 +3686,21 @@ input[type="submit"].btn.btn-mini { } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-topleft: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 4px; } .nav-tabs.nav-stacked > li > a:hover { |