Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
commit
8261866ff2
|
@ -22,7 +22,7 @@ title: Bootstrap
|
|||
<a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="./docs/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
|
||||
<a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
// Parent container
|
||||
.accordion {
|
||||
margin-bottom: @line-height-base;
|
||||
margin-bottom: @line-height-computed;
|
||||
}
|
||||
|
||||
// Group == heading + body
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
.breadcrumb {
|
||||
padding: 8px 15px;
|
||||
margin: 0 0 @line-height-base;
|
||||
margin: 0 0 @line-height-computed;
|
||||
list-style: none;
|
||||
background-color: #f5f5f5;
|
||||
border-radius: @border-radius-base;
|
||||
|
|
|
@ -25,8 +25,8 @@ code {
|
|||
// Blocks of code
|
||||
pre {
|
||||
display: block;
|
||||
padding: ((@line-height-base - 1) / 2);
|
||||
margin: 0 0 (@line-height-base / 2);
|
||||
padding: ((@line-height-computed - 1) / 2);
|
||||
margin: 0 0 (@line-height-computed / 2);
|
||||
font-size: (@font-size-base - 1); // 14px to 13px
|
||||
line-height: @line-height-base;
|
||||
word-break: break-all;
|
||||
|
@ -40,7 +40,7 @@ pre {
|
|||
|
||||
// Make prettyprint styles more spaced out for readability
|
||||
&.prettyprint {
|
||||
margin-bottom: @line-height-base;
|
||||
margin-bottom: @line-height-computed;
|
||||
}
|
||||
|
||||
// Account for some code outputs that place code tags in pre tags
|
||||
|
|
|
@ -340,7 +340,7 @@
|
|||
// Dividers (basically an hr) within dropdowns and nav lists
|
||||
.nav-divider(@top: #e5e5e5, @bottom: #fff) {
|
||||
height: 2px; // 1px for background, one for border
|
||||
margin: ((@line-height-base / 2) - 1) 0;
|
||||
margin: ((@line-height-computed / 2) - 1) 0;
|
||||
overflow: hidden;
|
||||
background-color: @top;
|
||||
border-bottom: 1px solid @bottom;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
|
||||
.pager {
|
||||
margin: @line-height-base 0;
|
||||
margin: @line-height-computed 0;
|
||||
list-style: none;
|
||||
text-align: center;
|
||||
.clearfix();
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// --------------------------------------------------
|
||||
.pagination {
|
||||
display: inline-block;
|
||||
margin: @line-height-base 0;
|
||||
margin: @line-height-computed 0;
|
||||
border-radius: @border-radius-base;
|
||||
}
|
||||
.pagination > li {
|
||||
|
|
|
@ -17,7 +17,7 @@ th {
|
|||
|
||||
.table {
|
||||
width: 100%;
|
||||
margin-bottom: @line-height-base;
|
||||
margin-bottom: @line-height-computed;
|
||||
// Cells
|
||||
thead > tr > th,
|
||||
tbody > tr > th,
|
||||
|
|
Loading…
Reference in New Issue