mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-28 06:20:15 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.1.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
This commit is contained in:
Mark Otto
2012-09-30 22:45:39 -07:00
parent ad96435d27 da43c7c27c
commit bbd543db53
14 changed files with 437 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3058,7 +3058,8 @@ button.close {
border-radius: 5px;
}
.btn-large [class^="icon-"] {
.btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
margin-top: 2px;
}
@@ -3070,7 +3071,8 @@ button.close {
border-radius: 3px;
}
.btn-small [class^="icon-"] {
.btn-small [class^="icon-"],
.btn-small [class*=" icon-"] {
margin-top: 0;
}