aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-13 09:35:43 -0700
committerMark Otto <[email protected]>2011-09-13 09:35:43 -0700
commit1d50fa77e43be353d522c19a5b955b7819388fca (patch)
tree28d9fdae57121dc6daf4caa03e42c896b17ea646
parentbc2ae90e3adde3ddb86c02b353b8c1048cdcef8f (diff)
downloadbootstrap-1d50fa77e43be353d522c19a5b955b7819388fca.tar.xz
bootstrap-1d50fa77e43be353d522c19a5b955b7819388fca.zip
adding quick and dirty favicons and touch icons for iOS
-rw-r--r--bootstrap-1.3.0.css5
-rw-r--r--bootstrap-1.3.0.min.css1
-rw-r--r--docs/assets/css/docs.css1
-rw-r--r--docs/assets/ico/bootstrap-apple-114x114.pngbin0 -> 6828 bytes
-rw-r--r--docs/assets/ico/bootstrap-apple-57x57.pngbin0 -> 3923 bytes
-rw-r--r--docs/assets/ico/bootstrap-apple-72x72.pngbin0 -> 4905 bytes
-rw-r--r--docs/assets/ico/favicon.icobin0 -> 1150 bytes
-rw-r--r--docs/index.html8
-rw-r--r--lib/reset.less5
9 files changed, 14 insertions, 6 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index f7dd9a9e6..a37af5766 100644
--- 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,
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index 8840aa751..7efe6ea62 100644
--- 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;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 650f6ec33..d30b932cd 100644
--- 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;
diff --git a/docs/assets/ico/bootstrap-apple-114x114.png b/docs/assets/ico/bootstrap-apple-114x114.png
new file mode 100644
index 000000000..c434d9713
--- /dev/null
+++ b/docs/assets/ico/bootstrap-apple-114x114.png
Binary files differ
diff --git a/docs/assets/ico/bootstrap-apple-57x57.png b/docs/assets/ico/bootstrap-apple-57x57.png
new file mode 100644
index 000000000..13c2f7f37
--- /dev/null
+++ b/docs/assets/ico/bootstrap-apple-57x57.png
Binary files differ
diff --git a/docs/assets/ico/bootstrap-apple-72x72.png b/docs/assets/ico/bootstrap-apple-72x72.png
new file mode 100644
index 000000000..c4bfb622c
--- /dev/null
+++ b/docs/assets/ico/bootstrap-apple-72x72.png
Binary files differ
diff --git a/docs/assets/ico/favicon.ico b/docs/assets/ico/favicon.ico
new file mode 100644
index 000000000..3455c3fb9
--- /dev/null
+++ b/docs/assets/ico/favicon.ico
Binary files differ
diff --git a/docs/index.html b/docs/index.html
index c8d5d81ef..fe372e0ef 100644
--- 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>
diff --git a/lib/reset.less b/lib/reset.less
index 9e2c6befe..6be76fdba 100644
--- 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
// -------------------------