mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 23:59:53 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Thornton
2012-09-24 23:16:09 -07:00
parent 003fcccceb f4d3d7da2e
commit bda3d57a00
7 changed files with 144 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/assets/css/bootstrap-responsive.css vendored
View File

@@ -820,6 +820,7 @@
margin-left: 0;
}
[class*="span"],
.uneditable-input[class*="span"],
.row-fluid [class*="span"] {
display: block;
float: none;

29
docs/assets/css/bootstrap.css vendored
View File

@@ -655,7 +655,7 @@ h6 {
margin: 10px 0;
font-family: inherit;
font-weight: bold;
line-height: 1;
line-height: 20px;
color: inherit;
text-rendering: optimizelegibility;
}
@@ -671,42 +671,42 @@ h6 small {
color: #999999;
}
h1 {
font-size: 36px;
h1,
h2,
h3 {
line-height: 40px;
}
h1 {
font-size: 38.5px;
}
h2 {
font-size: 30px;
line-height: 40px;
font-size: 31.5px;
}
h3 {
font-size: 24px;
line-height: 40px;
font-size: 24.5px;
}
h4 {
font-size: 18px;
line-height: 20px;
font-size: 17.5px;
}
h5 {
font-size: 14px;
line-height: 20px;
}
h6 {
font-size: 12px;
line-height: 20px;
font-size: 11.9px;
}
h1 small {
font-size: 24px;
font-size: 24.5px;
}
h2 small {
font-size: 18px;
font-size: 17.5px;
}
h3 small {
@@ -992,6 +992,7 @@ input[type="color"],
font-size: 14px;
line-height: 20px;
color: #555555;
vertical-align: middle;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;