diff options
author | Mark Otto <otto@github.com> | 2013-05-10 21:31:52 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2013-05-10 21:31:52 +0400 |
commit | 8261866ff2657cc8e57d0c4ab689b742d70b4c78 (patch) | |
tree | 0c9400f03328f7ba4aafdd3b4f8b1950e148ee6e /less | |
parent | 758cb9d186e3fd9fbc94162d15a5ee0dfb1f9ef9 (diff) | |
parent | 6dee7d5abe42f726bec27e650c123fdeaed27f74 (diff) |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
-rw-r--r-- | less/accordion.less | 2 | ||||
-rw-r--r-- | less/breadcrumbs.less | 2 | ||||
-rw-r--r-- | less/code.less | 6 | ||||
-rw-r--r-- | less/mixins.less | 2 | ||||
-rw-r--r-- | less/pager.less | 2 | ||||
-rw-r--r-- | less/pagination.less | 2 | ||||
-rw-r--r-- | less/tables.less | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/less/accordion.less b/less/accordion.less index 064377d05b..59765f1540 100644 --- a/less/accordion.less +++ b/less/accordion.less @@ -5,7 +5,7 @@ // Parent container .accordion { - margin-bottom: @line-height-base; + margin-bottom: @line-height-computed; } // Group == heading + body diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 87a6f0e371..2fe8217a36 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -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; diff --git a/less/code.less b/less/code.less index d9ddbc3a44..f1bc0a0cdb 100644 --- a/less/code.less +++ b/less/code.less @@ -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 diff --git a/less/mixins.less b/less/mixins.less index 48e2073c58..dc46be904e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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; diff --git a/less/pager.less b/less/pager.less index cc1947a91f..0b2fcf7cbb 100644 --- a/less/pager.less +++ b/less/pager.less @@ -4,7 +4,7 @@ .pager { - margin: @line-height-base 0; + margin: @line-height-computed 0; list-style: none; text-align: center; .clearfix(); diff --git a/less/pagination.less b/less/pagination.less index bb44fa8cf9..ec1eef27f9 100644 --- a/less/pagination.less +++ b/less/pagination.less @@ -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 { diff --git a/less/tables.less b/less/tables.less index 5c8fe82ad8..fa5fd554b2 100644 --- a/less/tables.less +++ b/less/tables.less @@ -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, |