diff options
| author | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
| commit | a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3 (patch) | |
| tree | 9b1c5697a731543a86711b016e1986ec1e81dad4 /_includes/header.html | |
| parent | 80e86442308b2cc86ba948de87e854057933e3ab (diff) | |
| parent | f1869771bc8b8e8a6c7a98385ec58e0bf0d2d98e (diff) | |
| download | bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.tar.xz bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.zip | |
Merge branch 'master' into pr/10951
Conflicts:
dist/css/bootstrap.min.css
less/modals.less
Diffstat (limited to '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/_includes/header.html b/_includes/header.html index d3cb270cb..18d7660b8 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,8 +1,9 @@ <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> -<meta name="description" content=""> -<meta name="author" content=""> +<meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development."> +<meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development"> +<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors"> <title> {% if page.title == "Bootstrap" %} @@ -13,16 +14,17 @@ </title> <!-- Bootstrap core CSS --> -<link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet"> +<link href="{{ page.base_url }}dist/css/bootstrap.min.css" rel="stylesheet"> <!-- Documentation extras --> <link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet"> <link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet"> +<!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]--> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="{{ page.base_url }}docs-assets/js/html5shiv.js"></script> - <script src="{{ page.base_url }}docs-assets/js/respond.min.js"></script> + <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> <![endif]--> <!-- Favicons --> |