framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Bootstrap 3.0.1

Browse Source
This commit is contained in:
Chris Carr
2013-10-30 14:30:53 -07:00
parent a3f2210e8e
commit 4ce5eb2dc4
52 changed files with 940 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
assets/less/bootstrap/forms.less
View File

@@ -82,6 +82,15 @@ input[type="number"] {
}
}
// Adjust output element
output {
display: block;
padding-top: (@padding-base-vertical + 1);
font-size: @font-size-base;
line-height: @line-height-base;
color: @input-color;
vertical-align: middle;
}
// Placeholder
//
@@ -124,6 +133,7 @@ input[type="number"] {
color: @input-color;
vertical-align: middle;
background-color: @input-bg;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid @input-border;
border-radius: @input-border-radius;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -257,7 +267,6 @@ input[type="checkbox"],
.form-control-static {
margin-bottom: 0; // Remove default margin from `p`
padding-top: (@padding-base-vertical + 1);
}
@@ -289,7 +298,7 @@ input[type="checkbox"],
.form-inline {
// Kick in the inline
@media (min-width: @screen-tablet) {
@media (min-width: @screen-sm) {
// Inline-block all the things for "inline"
.form-group {
display: inline-block;
@@ -344,8 +353,12 @@ input[type="checkbox"],
.make-row();
}
.form-control-static {
padding-top: (@padding-base-vertical + 1);
}
// Only right align form labels here when the columns stop stacking
@media (min-width: @screen-tablet) {
@media (min-width: @screen-sm-min) {
.control-label {
text-align: right;
}