mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 12:51:52 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto
2013-05-10 10:31:52 -07:00
parent 758cb9d186 6dee7d5abe
commit 8261866ff2
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/index.html
View File

@@ -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> <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
</li> </li>
<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>
<li> <li>
<a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a> <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>

2
less/accordion.less
View File

@@ -5,7 +5,7 @@
// Parent container // Parent container
.accordion { .accordion {
margin-bottom: @line-height-base; margin-bottom: @line-height-computed;
} }
// Group == heading + body // Group == heading + body

2
less/breadcrumbs.less
View File

@@ -5,7 +5,7 @@
.breadcrumb { .breadcrumb {
padding: 8px 15px; padding: 8px 15px;
margin: 0 0 @line-height-base; margin: 0 0 @line-height-computed;
list-style: none; list-style: none;
background-color: #f5f5f5; background-color: #f5f5f5;
border-radius: @border-radius-base; border-radius: @border-radius-base;

6
less/code.less
View File

@@ -25,8 +25,8 @@ code {
// Blocks of code // Blocks of code
pre { pre {
display: block; display: block;
padding: ((@line-height-base - 1) / 2); padding: ((@line-height-computed - 1) / 2);
margin: 0 0 (@line-height-base / 2); margin: 0 0 (@line-height-computed / 2);
font-size: (@font-size-base - 1); // 14px to 13px font-size: (@font-size-base - 1); // 14px to 13px
line-height: @line-height-base; line-height: @line-height-base;
word-break: break-all; word-break: break-all;
@@ -40,7 +40,7 @@ pre {
// Make prettyprint styles more spaced out for readability // Make prettyprint styles more spaced out for readability
&.prettyprint { &.prettyprint {
margin-bottom: @line-height-base; margin-bottom: @line-height-computed;
} }
// Account for some code outputs that place code tags in pre tags // Account for some code outputs that place code tags in pre tags

2
less/mixins.less
View File

@@ -340,7 +340,7 @@
// Dividers (basically an hr) within dropdowns and nav lists // Dividers (basically an hr) within dropdowns and nav lists
.nav-divider(@top: #e5e5e5, @bottom: #fff) { .nav-divider(@top: #e5e5e5, @bottom: #fff) {
height: 2px; // 1px for background, one for border height: 2px; // 1px for background, one for border
margin: ((@line-height-base / 2) - 1) 0; margin: ((@line-height-computed / 2) - 1) 0;
overflow: hidden; overflow: hidden;
background-color: @top; background-color: @top;
border-bottom: 1px solid @bottom; border-bottom: 1px solid @bottom;

2
less/pager.less
View File

@@ -4,7 +4,7 @@
.pager { .pager {
margin: @line-height-base 0; margin: @line-height-computed 0;
list-style: none; list-style: none;
text-align: center; text-align: center;
.clearfix(); .clearfix();

2
less/pagination.less
View File

@@ -3,7 +3,7 @@
// -------------------------------------------------- // --------------------------------------------------
.pagination { .pagination {
display: inline-block; display: inline-block;
margin: @line-height-base 0; margin: @line-height-computed 0;
border-radius: @border-radius-base; border-radius: @border-radius-base;
} }
.pagination > li { .pagination > li {

2
less/tables.less
View File

@@ -17,7 +17,7 @@ th {
.table { .table {
width: 100%; width: 100%;
margin-bottom: @line-height-base; margin-bottom: @line-height-computed;
// Cells // Cells
thead > tr > th, thead > tr > th,
tbody > tr > th, tbody > tr > th,