Merge pull request #13189 from twbs/apple-touch-icon

New apple touch icon and favicon

23 files changed, 20 insertions, 20 deletions

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index b21969451..e60853ef4 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -34,8 +34,8 @@
 <![endif]-->
 
 <!-- Favicons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
-<link rel="shortcut icon" href="../assets/ico/favicon.ico">
+<link rel="apple-touch-icon-precomposed" href="/apple-touch-icon-precomposed.png">
+<link rel="icon" href="/favicon.ico">
 
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/docs/apple-touch-icon-precomposed.png b/docs/apple-touch-icon-precomposed.png
new file mode 100644
index 000000000..61e0831cd
--- /dev/null
+++ b/docs/apple-touch-icon-precomposed.png
diff --git a/docs/assets/ico/apple-touch-icon-144-precomposed.png b/docs/assets/ico/apple-touch-icon-144-precomposed.png
deleted file mode 100644
index 622a865a9..000000000
--- a/docs/assets/ico/apple-touch-icon-144-precomposed.png
+++ /dev/null
diff --git a/docs/assets/ico/favicon.ico b/docs/assets/ico/favicon.ico
deleted file mode 100644
index f576a4696..000000000
--- a/docs/assets/ico/favicon.ico
+++ /dev/null
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html
index e087fb457..6395e48d2 100644
--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Blog Template for Bootstrap</title>
 
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index 4b18e353c..b0486f627 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Carousel Template for Bootstrap</title>
 
diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html
index 7ea992e46..193fc74b4 100644
--- a/docs/examples/cover/index.html
+++ b/docs/examples/cover/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Cover Template for Bootstrap</title>
 
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index bdb955bcf..19016bc19 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Dashboard Template for Bootstrap</title>
 
diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 17a06c5e8..2dff5df9b 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Grid Template for Bootstrap</title>
 
diff --git a/docs/examples/jumbotron-narrow/index.html b/docs/examples/jumbotron-narrow/index.html
index 01ece220f..56398c96e 100644
--- a/docs/examples/jumbotron-narrow/index.html
+++ b/docs/examples/jumbotron-narrow/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Narrow Jumbotron Template for Bootstrap</title>
 
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
index 592d277de..932313f0d 100644
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Jumbotron Template for Bootstrap</title>
 
diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html
index 9817401c5..138d3c9bb 100644
--- a/docs/examples/justified-nav/index.html
+++ b/docs/examples/justified-nav/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Justified Nav Template for Bootstrap</title>
 
diff --git a/docs/examples/navbar-fixed-top/index.html b/docs/examples/navbar-fixed-top/index.html
index 2d719ff6b..f7c5e2e47 100644
--- a/docs/examples/navbar-fixed-top/index.html
+++ b/docs/examples/navbar-fixed-top/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Fixed Top Navbar Example for Bootstrap</title>
 
diff --git a/docs/examples/navbar-static-top/index.html b/docs/examples/navbar-static-top/index.html
index 70fb7a4e5..00c9dfd38 100644
--- a/docs/examples/navbar-static-top/index.html
+++ b/docs/examples/navbar-static-top/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Static Top Navbar Example for Bootstrap</title>
 
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
index 491dd0e1f..ddb5c99fa 100644
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Navbar Template for Bootstrap</title>
 
diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html
index 7210419de..10859dad1 100644
--- a/docs/examples/non-responsive/index.html
+++ b/docs/examples/non-responsive/index.html
@@ -8,7 +8,7 @@
 
     <!-- Note there is no responsive meta tag here -->
 
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Non-responsive Template for Bootstrap</title>
 
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
index 42c405e56..04629579b 100644
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Off Canvas Template for Bootstrap</title>
 
diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html
index d96ded7f6..c9d2293a0 100644
--- a/docs/examples/signin/index.html
+++ b/docs/examples/signin/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Signin Template for Bootstrap</title>
 
diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html
index c3b7fb473..560e81da2 100644
--- a/docs/examples/starter-template/index.html
+++ b/docs/examples/starter-template/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Starter Template for Bootstrap</title>
 
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index 25f0e13c5..30deb2886 100644
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Sticky Footer Navbar Template for Bootstrap</title>
 
diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html
index d171d5e87..a248e032f 100644
--- a/docs/examples/sticky-footer/index.html
+++ b/docs/examples/sticky-footer/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Sticky Footer Template for Bootstrap</title>
 
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html
index a391264ec..2916b2f3a 100644
--- a/docs/examples/theme/index.html
+++ b/docs/examples/theme/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../favicon.ico">
 
     <title>Theme Template for Bootstrap</title>
 
diff --git a/docs/favicon.ico b/docs/favicon.ico
new file mode 100644
index 000000000..52213c7b8
--- /dev/null
+++ b/docs/favicon.ico