projects
/
bootswatch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3.0.0 -> 3.0.1
[bootswatch]
/
bower_components
/
bootstrap
/
less
/
forms.less
diff --git
a/bower_components/bootstrap/less/forms.less
b/bower_components/bootstrap/less/forms.less
index
f87b602
..
f6bbce5
100755
(executable)
--- a/
bower_components/bootstrap/less/forms.less
+++ b/
bower_components/bootstrap/less/forms.less
@@
-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
//
// Placeholder
//
@@
-124,6
+133,7
@@
input[type="number"] {
color: @input-color;
vertical-align: middle;
background-color: @input-bg;
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));
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`
.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
.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;
// Inline-block all the things for "inline"
.form-group {
display: inline-block;
@@
-344,8
+353,12
@@
input[type="checkbox"],
.make-row();
}
.make-row();
}
+ .form-control-static {
+ padding-top: (@padding-base-vertical + 1);
+ }
+
// Only right align form labels here when the columns stop stacking
// 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;
}
.control-label {
text-align: right;
}