]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bc2ae90)
adding quick and dirty favicons and touch icons for iOS
authorMark Otto <mark.otto@twitter.com>
Tue, 13 Sep 2011 16:35:43 +0000 (09:35 -0700)
committerMark Otto <mark.otto@twitter.com>
Tue, 13 Sep 2011 16:35:43 +0000 (09:35 -0700)
bootstrap-1.3.0.css patch | blob | blame | history
bootstrap-1.3.0.min.css patch | blob | blame | history
docs/assets/css/docs.css patch | blob | blame | history
docs/assets/ico/bootstrap-apple-114x114.png [new file with mode: 0644] patch | blob
docs/assets/ico/bootstrap-apple-57x57.png [new file with mode: 0644] patch | blob
docs/assets/ico/bootstrap-apple-72x72.png [new file with mode: 0644] patch | blob
docs/assets/ico/favicon.ico [new file with mode: 0644] patch | blob
docs/index.html patch | blob | blame | history
lib/reset.less patch | blob | blame | history

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index f7dd9a9e677c810addb7715e2b2706375f0907c5..a37af5766bc0955eb9e7c9852c6f5ac5f73b23d4 100644 (file)
--- 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 8840aa751cd72aeb8c8cb6ce5dee924f5f807151..7efe6ea626b373ef1e1d0f5fb962ab3db213c3dd 100644 (file)
--- 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 650f6ec33d90c9fb14561c52de32878bfc1d15d8..d30b932cd4275381ae1c72d7fc5fcbf03d50fe77 100644 (file)
--- 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 (file)
index 0000000..c434d97
Binary files /dev/null and b/docs/assets/ico/bootstrap-apple-114x114.png differ
diff --git a/docs/assets/ico/bootstrap-apple-57x57.png b/docs/assets/ico/bootstrap-apple-57x57.png
new file mode 100644 (file)
index 0000000..13c2f7f
Binary files /dev/null and b/docs/assets/ico/bootstrap-apple-57x57.png differ
diff --git a/docs/assets/ico/bootstrap-apple-72x72.png b/docs/assets/ico/bootstrap-apple-72x72.png
new file mode 100644 (file)
index 0000000..c4bfb62
Binary files /dev/null and b/docs/assets/ico/bootstrap-apple-72x72.png differ
diff --git a/docs/assets/ico/favicon.ico b/docs/assets/ico/favicon.ico
new file mode 100644 (file)
index 0000000..3455c3f
Binary files /dev/null and b/docs/assets/ico/favicon.ico differ
diff --git a/docs/index.html b/docs/index.html
index c8d5d81ef23fabeb91aef4b27e6099d9306c0891..fe372e0ef45c71ea263e93667fe5ff8665be074f 100644 (file)
--- 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 9e2c6befe7ce5f9a2df36f02fee0f8a57c29d172..6be76fdba6ac0e42f1bc9009a7ecf5723dd0b509 100644 (file)
--- 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
 // -------------------------
Mirror of https://github.com/twbs/bootstrap.git