From 20746c677a595fd32801ce46843a7ea834bb3784 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 21 Oct 2013 12:21:02 -0400 Subject: [PATCH] Fixed `vertical-align` issue in form styling https://github.com/cferdinandi/kraken/issues/13 --- README.md | 1 + kraken.css | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 410b976f..329f0c72 100755 --- a/README.md +++ b/README.md @@ -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) diff --git a/kraken.css b/kraken.css index 3e3fe5b4..37507863 100644 --- a/kraken.css +++ b/kraken.css @@ -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; } @@ -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; } } @@ -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; @@ -667,7 +671,8 @@ select { box-sizing: border-box; } -form button, form .btn { +form button, +form .btn { margin-bottom: 1.176470588em; } @@ -708,6 +713,7 @@ select:focus { .input-inline { display: inline-block; width: auto; + vertical-align: middle; }