diff options
| author | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
| commit | 6df6723c156ab565c7b6341fc58582fceadd7649 (patch) | |
| tree | 4cc372a56ece6b8250b1bcadf433f6e5ea1853ca /getting-started.html | |
| parent | b593df183087d88940d7af3e59b401685ada3dfe (diff) | |
| parent | 3887f540b978d593f433bfef15888bc2d103de72 (diff) | |
| download | bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.tar.xz bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.zip | |
Merge branch 'master' into docs_derp
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'getting-started.html')
| -rw-r--r-- | getting-started.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/getting-started.html b/getting-started.html index cdc9e7603..5a735b68c 100644 --- a/getting-started.html +++ b/getting-started.html @@ -108,7 +108,7 @@ bootstrap/ <title>Bootstrap 101 Template</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> - <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"> + <link href="css/bootstrap.min.css" rel="stylesheet"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> @@ -469,10 +469,6 @@ bootstrap/ <td><code>.accordion-inner</code></td> <td><code>.panel-body</code></td> </tr> - <tr> - <td><code>.alert-error</code></td> - <td><code>.alert-danger</code></td> - </tr> </tbody> </table> </div><!-- /.table-responsive --> |