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

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

Browse Source 
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
This commit is contained in:
Mark Otto
2012-09-07 22:34:51 -07:00
parent cb46ddee72 f29f98501c
commit 7e29581210
64 changed files with 709 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap-responsive.css
Vendored
+9 -3
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.1.1
* Bootstrap Responsive v2.1.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -339,8 +339,11 @@
.row-fluid [class*="span"] {
display: block;
float: none;
width: auto;
width: 100%;
margin-left: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.span12,
.row-fluid .span12 {
@@ -349,6 +352,9 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.row-fluid [class*="offset"]:first-child {
margin-left: 0;
}
.input-large,
.input-xlarge,
.input-xxlarge,
@@ -398,7 +404,7 @@
input[type="radio"] {
border: 1px solid #ccc;
}
.form-horizontal .control-group > label {
.form-horizontal .control-label {
float: none;
width: auto;
padding-top: 0;