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

New apple touch icon and favicon

Merge pull request #13189 from twbs/apple-touch-icon
New apple touch icon and favicon
76277f87 · Mark Otto · fe74a8bb · e1f9c25f · 76277f87 · 76277f87
Commit 76277f87 authored 10 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 18 additions and 18 deletions
+18 -18
--- 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(){

--- a/docs/apple-touch-icon-precomposed.png
+++ b/docs/apple-touch-icon-precomposed.png
--- a/docs/assets/ico/apple-touch-icon-144-precomposed.png
+++ b/docs/assets/ico/apple-touch-icon-144-precomposed.png
--- a/docs/assets/ico/favicon.ico
+++ b/docs/assets/ico/favicon.ico
--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>


--- 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>