aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-15 13:12:29 -0800
committerMark Otto <[email protected]>2012-01-15 13:12:29 -0800
commit127c0d0b52c52227dcd3f346d371e5cd4219a08f (patch)
tree9fd4750f1276eaeec3e80339db6131f5b05a5af7
parentf43f2c0ea269e72251e7f858b44ccef966d079af (diff)
downloadbootstrap-127c0d0b52c52227dcd3f346d371e5cd4219a08f.tar.xz
bootstrap-127c0d0b52c52227dcd3f346d371e5cd4219a08f.zip
make dl and child elements less specific
-rw-r--r--bootstrap.css8
-rw-r--r--bootstrap.min.css7
-rw-r--r--docs/components.html18
-rw-r--r--lib/type.less19
4 files changed, 25 insertions, 27 deletions
diff --git a/bootstrap.css b/bootstrap.css
index a57618dc0..b5f7949e5 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Jan 15 12:53:17 PST 2012
+ * Date: Sun Jan 15 13:11:42 PST 2012
*/
html, body {
margin: 0;
@@ -418,13 +418,13 @@ ul.unstyled {
dl {
margin-bottom: 18px;
}
-dl dt, dl dd {
+dt, dd {
line-height: 18px;
}
-dl dt {
+dt {
font-weight: bold;
}
-dl dd {
+dd {
margin-left: 9px;
}
hr {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 1ef582c03..2cd9ad837 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -73,9 +73,10 @@ ul{list-style:disc;}
ol{list-style:decimal;}
li{line-height:18px;}
ul.unstyled{margin-left:0;list-style:none;}
-dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
-dl dt{font-weight:bold;}
-dl dd{margin-left:9px;}
+dl{margin-bottom:18px;}
+dt,dd{line-height:18px;}
+dt{font-weight:bold;}
+dd{margin-left:9px;}
hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #fff;}
strong{font-style:inherit;font-weight:bold;}
em{font-style:italic;font-weight:inherit;line-height:inherit;}
diff --git a/docs/components.html b/docs/components.html
index c9390272d..1343a4279 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -865,33 +865,29 @@
<p>The default pagination component is flexible and works in a number of variations.</p>
<div class="pagination">
<ul>
- <li class="disabled"><a href="#">&larr; Prev</a></li>
+ <li class="disabled"><a href="#">&laquo;</a></li>
<li class="active"><a href="#">1</a></li>
<li><a href="#">2</a></li>
<li><a href="#">3</a></li>
<li><a href="#">4</a></li>
- <li><a href="#">Next &rarr;</a></li>
+ <li><a href="#">&raquo;</a></li>
</ul>
</div>
<div class="pagination">
<ul>
- <li><a href="#">&larr;</a></li>
+ <li><a href="#">&laquo;</a></li>
<li><a href="#">10</a></li>
- <li><a href="#">11</a></li>
- <li class="active"><a href="#">12</a></li>
- <li><a href="#">13</a></li>
- <li><a href="#">14</a></li>
- <li><a href="#">&rarr;</a></li>
+ <li class="active"><a href="#">11</a></li>
+ <li><a href="#">12</a></li>
+ <li><a href="#">&raquo;</a></li>
</ul>
</div>
<div class="pagination">
<ul>
<li><a href="#">&larr;</a></li>
<li class="active"><a href="#">10</a></li>
- <li><a href="#">11</a></li>
- <li class="disabled"><a href="#">…</a></li>
+ <li class="disabled"><a href="#">...</a></li>
<li><a href="#">20</a></li>
- <li><a href="#">21</a></li>
<li><a href="#">&rarr;</a></li>
</ul>
</div>
diff --git a/lib/type.less b/lib/type.less
index ab7409ce3..707d2215d 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -99,15 +99,16 @@ ul.unstyled {
// Description Lists
dl {
margin-bottom: @baseLineHeight;
- dt, dd {
- line-height: @baseLineHeight;
- }
- dt {
- font-weight: bold;
- }
- dd {
- margin-left: @baseLineHeight / 2;
- }
+}
+dt,
+dd {
+ line-height: @baseLineHeight;
+}
+dt {
+ font-weight: bold;
+}
+dd {
+ margin-left: @baseLineHeight / 2;
}
// MISC