Skip to content

Commit

Permalink
Fixed vertical-align issue in form styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Ferdinandi committed Oct 21, 2013
1 parent 371d24b commit 20746c6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Kraken is an open-source project. [Learn how you can get involved.](http://cferd
* [Removed IE7- hacks](https://github.com/cferdinandi/kraken/issues/7).
* [Updated grid for better performance](https://github.com/cferdinandi/kraken/issues/9).
* [Converted from spaces to tabs](https://github.com/cferdinandi/kraken/issues/11).
* [Fixed `vertical-align` and `display: block` conflict for forms](https://github.com/cferdinandi/kraken/issues/13).
* v2.4 (October 18, 2013)
* Fixed [`input-inline`](https://github.com/cferdinandi/kraken/issues/6).
* v2.3 (August 24,2013)
Expand Down
20 changes: 13 additions & 7 deletions kraken.css
Original file line number Diff line number Diff line change
Expand Up @@ -396,16 +396,19 @@ h1, h2, h3, h4, h5, h6 {
padding-top: 1em;
}

h1, .h1 {
h1,
.h1 {
font-size: 1.529411765em;
padding-top: .5em;
}

h2, .h2 {
h2,
.h2 {
font-size: 1.352941176em;
}

h3, .h3 {
h3,
.h3 {
font-size: 1.176470588em;
}

Expand All @@ -415,12 +418,14 @@ h4, h5, h6,
font-style: italic;
}

h4, .h4 {
h4,
.h4 {
text-transform: uppercase;
}

@media (min-width: 40em) {
h1, .h1 {
h1,
.h1 {
font-size: 1.764705882em;
}
}
Expand Down Expand Up @@ -657,7 +662,6 @@ select {
font: inherit;
line-height: 1.470588235;
color: #555555;
vertical-align: middle;
margin-bottom: 1.176470588em;
padding: .294117647em;
border: .071428571em solid #b8b8b8;
Expand All @@ -667,7 +671,8 @@ select {
box-sizing: border-box;
}

form button, form .btn {
form button,
form .btn {
margin-bottom: 1.176470588em;
}

Expand Down Expand Up @@ -708,6 +713,7 @@ select:focus {
.input-inline {
display: inline-block;
width: auto;
vertical-align: middle;
}


Expand Down

0 comments on commit 20746c6

Please sign in to comment.