mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

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

Browse Source 
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
This commit is contained in:
Mark Otto
2012-07-23 23:01:38 -07:00
parent 0dda2c4659 614d52bd7f
commit f085dbadd1
44 changed files with 2494 additions and 1933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+5
View File
@@ -67,6 +67,7 @@ sub {
}
img {
height: auto;
max-width: 100%;
vertical-align: middle;
border: 0;
@@ -5501,3 +5502,7 @@ a.badge:hover {
.invisible {
visibility: hidden;
}
.affix {
position: fixed;
}