app/frameworks/twitter/bootstrap/forms.less in less-rails-bootstrap-3.0.3 vs app/frameworks/twitter/bootstrap/forms.less in less-rails-bootstrap-3.0.4
- old
+ new
@@ -80,10 +80,19 @@
&::-webkit-inner-spin-button {
height: auto;
}
}
+// 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
//
// Placeholder text gets special styles because when browsers invalidate entire
// lines if it doesn't understand a selector/
@@ -122,10 +131,11 @@
font-size: @font-size-base;
line-height: @line-height-base;
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));
.transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
@@ -255,11 +265,10 @@
// Apply class to a `p` element to make any string of text align with labels in
// a horizontal form layout.
.form-control-static {
margin-bottom: 0; // Remove default margin from `p`
- padding-top: (@padding-base-vertical + 1);
}
// Help text
//
@@ -287,11 +296,11 @@
// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
.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;
margin-bottom: 0;
vertical-align: middle;
@@ -342,11 +351,15 @@
// Make form groups behave like rows
.form-group {
.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;
}
}
}