mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Code Activity

Merge branch '2.1.2-wip' into box-sizing-exercise

Browse Source 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
This commit is contained in:
Mark Otto
2012-09-25 22:00:41 -07:00
parent 527d01ce99 f4d3d7da2e
commit ce19e63d5b
65 changed files with 7799 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap-responsive.css
Vendored
+11
View File
@@ -504,6 +504,7 @@
margin-left: 0;
}
[class*="span"],
.uneditable-input[class*="span"],
.row-fluid [class*="span"] {
display: block;
float: none;
@@ -588,6 +589,16 @@
padding-right: 10px;
padding-left: 10px;
}
.media .pull-left,
.media .pull-right {
display: block;
float: none;
margin-bottom: 10px;
}
.media-object {
margin-right: 0;
margin-left: 0;
}
.modal {
top: 10px;
right: 10px;