adding quick and dirty favicons and touch icons for iOS

1d50fa77 · Mark Otto · bc2ae90e · 1d50fa77 · 1d50fa77 · 1d50fa77
Commit 1d50fa77 authored 13 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 14 additions and 6 deletions
+14 -6
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.css
@@ -6,7 +6,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Mon Sep 12 22:15:45 PDT 2011
+ * Date: Tue Sep 13 09:06:02 PDT 2011
 */
 /* Reset.less
 * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -94,6 +94,9 @@ html {
 a:focus {
  outline: thin dotted;
 }
+a:hover, a:active {
+  outline: 0;
+}
 article,
 aside,
 details,

--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -5,6 +5,7 @@ ol,ul{list-style:none;}
 q:before,q:after,blockquote:before,blockquote:after{content:"";}
 html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
 a:focus{outline:thin dotted;}
+a:hover,a:active{outline:0;}
 article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
 audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]){display:none;}

--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -23,7 +23,6 @@ section > .row {
 -------------------------------------------------- */
 .jumbotron {
  padding-top: 40px;
-  overflow: hidden;
 }
 .jumbotron .inner {
  background: transparent url(../img/grid-18px.png) top center;

--- a/docs/assets/ico/bootstrap-apple-114x114.png
+++ b/docs/assets/ico/bootstrap-apple-114x114.png
--- a/docs/assets/ico/bootstrap-apple-57x57.png
+++ b/docs/assets/ico/bootstrap-apple-57x57.png
--- a/docs/assets/ico/bootstrap-apple-72x72.png
+++ b/docs/assets/ico/bootstrap-apple-72x72.png
--- a/docs/assets/ico/favicon.ico
+++ b/docs/assets/ico/favicon.ico
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,10 +27,10 @@
    <script src="assets/js/application.js"></script>

    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
+    <link rel="shortcut icon" type="image/x-icon" href="assets/ico/favicon.ico">
+    <link rel="apple-touch-icon" href="assets/ico/bootstrap-apple-57x57.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="assets/ico/bootstrap-apple-72x72.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="assets/ico/bootstrap-apple-114x114.png">
  </head>

  <body>

--- a/lib/reset.less
+++ b/lib/reset.less
@@ -30,6 +30,11 @@ html {
 a:focus {
  outline: thin dotted;
 }
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}

 // Display in IE6-9 and FF3
 // -------------------------