Browse Source

Merge pull request #529 from twbs/input-height

Make inputs and input-rows a consistent height
pull/522/head
Connor Sears 11 years ago
parent
commit
a57d2ae616
  1. 3
      dist/css/ratchet.css
  2. 2
      dist/css/ratchet.min.css
  3. 3
      docs/dist/css/ratchet.css
  4. 2
      docs/dist/css/ratchet.min.css
  5. 3
      sass/forms.scss

3
dist/css/ratchet.css vendored

@ -896,6 +896,7 @@ select {
} }
.input-row { .input-row {
height: 35px;
overflow: hidden; overflow: hidden;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
@ -903,7 +904,7 @@ select {
.input-row label { .input-row label {
float: left; float: left;
width: 35%; width: 35%;
padding: 10px 15px; padding: 8px 15px;
font-family: "Helvetica Neue", Helvetica, sans-serif; font-family: "Helvetica Neue", Helvetica, sans-serif;
line-height: 1.1; line-height: 1.1;
} }

2
dist/css/ratchet.min.css vendored

File diff suppressed because one or more lines are too long

3
docs/dist/css/ratchet.css vendored

@ -896,6 +896,7 @@ select {
} }
.input-row { .input-row {
height: 35px;
overflow: hidden; overflow: hidden;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
@ -903,7 +904,7 @@ select {
.input-row label { .input-row label {
float: left; float: left;
width: 35%; width: 35%;
padding: 10px 15px; padding: 8px 15px;
font-family: "Helvetica Neue", Helvetica, sans-serif; font-family: "Helvetica Neue", Helvetica, sans-serif;
line-height: 1.1; line-height: 1.1;
} }

2
docs/dist/css/ratchet.min.css vendored

File diff suppressed because one or more lines are too long

3
sass/forms.scss

@ -92,6 +92,7 @@ select {
// To use labels with input groups, wrap a label and an input in an .input-row // To use labels with input groups, wrap a label and an input in an .input-row
.input-row { .input-row {
overflow: hidden; overflow: hidden;
height: 35px; // Matches the height of inputs.
border-bottom: $border-default; border-bottom: $border-default;
} }
@ -99,7 +100,7 @@ select {
.input-row label { .input-row label {
float: left; float: left;
width: 35%; width: 35%;
padding: 10px 15px; padding: 8px 15px;
font-family: $font-family-default; font-family: $font-family-default;
line-height: 1.1; // Put the text on the baseline. line-height: 1.1; // Put the text on the baseline.
} }

Loading…
Cancel
Save