rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-28 10:24:19 +01:00
Code Issues Actions Packages Releases Activity

make dl and child elements less specific

Browse Source
This commit is contained in:
Mark Otto 2012-01-15 13:12:29 -08:00
parent f43f2c0ea2
commit 127c0d0b52
4 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 { html, body {
margin: 0; margin: 0;
@ -418,13 +418,13 @@ ul.unstyled {
dl { dl {
margin-bottom: 18px; margin-bottom: 18px;
} }
dl dt, dl dd { dt, dd {
line-height: 18px; line-height: 18px;
} }
dl dt { dt {
font-weight: bold; font-weight: bold;
} }
dl dd { dd {
margin-left: 9px; margin-left: 9px;
} }
hr { hr {

7
bootstrap.min.css vendored
View File

@ -73,9 +73,10 @@ ul{list-style:disc;}
ol{list-style:decimal;} ol{list-style:decimal;}
li{line-height:18px;} li{line-height:18px;}
ul.unstyled{margin-left:0;list-style:none;} ul.unstyled{margin-left:0;list-style:none;}
dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;} dl{margin-bottom:18px;}
dl dt{font-weight:bold;} dt,dd{line-height:18px;}
dl dd{margin-left:9px;} dt{font-weight:bold;}
dd{margin-left:9px;}
hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #fff;} hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #fff;}
strong{font-style:inherit;font-weight:bold;} strong{font-style:inherit;font-weight:bold;}
em{font-style:italic;font-weight:inherit;line-height:inherit;} em{font-style:italic;font-weight:inherit;line-height:inherit;}

18
docs/components.html
View File

@ -865,33 +865,29 @@
<p>The default pagination component is flexible and works in a number of variations.</p> <p>The default pagination component is flexible and works in a number of variations.</p>
<div class="pagination"> <div class="pagination">
<ul> <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 class="active"><a href="#">1</a></li>
<li><a href="#">2</a></li> <li><a href="#">2</a></li>
<li><a href="#">3</a></li> <li><a href="#">3</a></li>
<li><a href="#">4</a></li> <li><a href="#">4</a></li>
<li><a href="#">Next &rarr;</a></li> <li><a href="#">&raquo;</a></li>
</ul> </ul>
</div> </div>
<div class="pagination"> <div class="pagination">
<ul> <ul>
<li><a href="#">&larr;</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">10</a></li> <li><a href="#">10</a></li>
<li><a href="#">11</a></li> <li class="active"><a href="#">11</a></li>
<li class="active"><a href="#">12</a></li> <li><a href="#">12</a></li>
<li><a href="#">13</a></li> <li><a href="#">&raquo;</a></li>
<li><a href="#">14</a></li>
<li><a href="#">&rarr;</a></li>
</ul> </ul>
</div> </div>
<div class="pagination"> <div class="pagination">
<ul> <ul>
<li><a href="#">&larr;</a></li> <li><a href="#">&larr;</a></li>
<li class="active"><a href="#">10</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="#">20</a></li>
<li><a href="#">21</a></li>
<li><a href="#">&rarr;</a></li> <li><a href="#">&rarr;</a></li>
</ul> </ul>
</div> </div>

19
lib/type.less
View File

@ -99,15 +99,16 @@ ul.unstyled {
// Description Lists // Description Lists
dl { dl {
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
dt, dd { }
line-height: @baseLineHeight; dt,
} dd {
dt { line-height: @baseLineHeight;
font-weight: bold; }
} dt {
dd { font-weight: bold;
margin-left: @baseLineHeight / 2; }
} dd {
margin-left: @baseLineHeight / 2;
} }
// MISC // MISC