aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-10 13:00:07 -0700
committerMark Otto <[email protected]>2011-09-10 13:00:07 -0700
commit5b1615015931986b064aa12c222c1059e58f25e5 (patch)
tree602ecb3774a1916e294f0bc186e0b90128e8a3a2
parent0b43bc9bb9266fa8e8d830b82ede20fb3a939acd (diff)
downloadbootstrap-5b1615015931986b064aa12c222c1059e58f25e5.tar.xz
bootstrap-5b1615015931986b064aa12c222c1059e58f25e5.zip
trying to solve firefox active outline, make .input less specific
-rw-r--r--bootstrap-1.3.0.css8
-rw-r--r--bootstrap-1.3.0.min.css3
-rw-r--r--docs/index.html4
-rw-r--r--lib/forms.less2
-rw-r--r--lib/reset.less5
5 files changed, 16 insertions, 6 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index e8024e443..dbe1bdcfa 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: Fri Sep 9 21:42:21 PDT 2011
+ * Date: Sat Sep 10 12:59:54 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).
@@ -91,6 +91,10 @@ html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
+a:active {
+ outline: none;
+ -moz-outline-style: none;
+}
a:focus {
outline: thin dotted;
}
@@ -702,7 +706,7 @@ label {
text-align: right;
color: #404040;
}
-div.input {
+form .input {
margin-left: 150px;
}
input[type=checkbox], input[type=radio] {
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index de1d659b3..3f9367d47 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -4,6 +4,7 @@ table{border-collapse:collapse;border-spacing:0;}
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:active{outline:none;-moz-outline-style:none;}
a:focus{outline:thin dotted;}
article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
@@ -115,7 +116,7 @@ fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padd
form .clearfix{margin-bottom:18px;}
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
-div.input{margin-left:150px;}
+form .input{margin-left:150px;}
input[type=checkbox],input[type=radio]{cursor:pointer;}
input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;}
diff --git a/docs/index.html b/docs/index.html
index d88e812d1..603419341 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -455,7 +455,7 @@
</p>
</div>
<div class="span12">
- <h4>When to use</h4>
+ <h3>When to use</h3>
<p>Emphasis tags (<code>&lt;strong&gt;</code> and <code>&lt;em&gt;</code>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <code>&lt;strong&gt;</code> for importance and <code>&lt;em&gt;</code> for <em>stress</em> emphasis.</p>
<h3>Emphasis in a paragraph</h3>
<p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
@@ -497,7 +497,7 @@
</p>
</div>
<div class="span12">
- <h4>How to quote</h4>
+ <h3>How to quote</h3>
<p>To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around <code>&lt;p&gt;</code> and <code>&lt;small&gt;</code> tags. Use the <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it.</p>
<blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
diff --git a/lib/forms.less b/lib/forms.less
index 3e52875eb..2ac43177e 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -50,7 +50,7 @@ label {
}
// Shift over the inside div to align all label's relevant content
-div.input {
+form .input {
margin-left: 150px;
}
diff --git a/lib/reset.less b/lib/reset.less
index 9e2c6befe..93fd97ae9 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -26,6 +26,11 @@ html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
+// Active links get no outline
+a:active {
+ outline: none;
+ -moz-outline-style: none;
+}
// Focus states
a:focus {
outline: thin dotted;