diff options
| author | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
| commit | e148923f2764d0af6f7d6fb1b601840d241759b5 (patch) | |
| tree | 7831543c9b205eb0d184f2eb3187fb2cd3873110 /dist/css/bootstrap.css | |
| parent | ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf (diff) | |
| parent | 22d308b2c12525a7ba65fca4f2ca7dba8a2a80bb (diff) | |
| download | bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.tar.xz bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b51a6c04f..4a78c468b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,4 +1,4 @@ -/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ article, aside, @@ -26,7 +26,8 @@ audio:not([controls]) { height: 0; } -[hidden] { +[hidden], +template { display: none; } @@ -40,6 +41,10 @@ body { margin: 0; } +a { + background: transparent; +} + a:focus { outline: thin dotted; } @@ -3950,7 +3955,7 @@ textarea.input-group-sm > .input-group-btn > .btn { } .nav-pills > li > a { - border-radius: 5px; + border-radius: 4px; } .nav-pills > li + li { |