diff options
| author | Jacob Thornton <[email protected]> | 2012-09-24 23:16:09 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-09-24 23:16:09 -0700 |
| commit | bda3d57a001a4cbaf54718a9c4b9c4dbd54bef09 (patch) | |
| tree | 4370ca1cfc5cdf1c4aca31c0dcff786b534f839e /less | |
| parent | 003fcccceb869ac0420d542bac9860f5f32e68a1 (diff) | |
| parent | f4d3d7da2e3ddbd751e053729935df1f3dd4c051 (diff) | |
| download | bootstrap-bda3d57a001a4cbaf54718a9c4b9c4dbd54bef09.tar.xz bootstrap-bda3d57a001a4cbaf54718a9c4b9c4dbd54bef09.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 1 | ||||
| -rw-r--r-- | less/responsive-767px-max.less | 1 | ||||
| -rw-r--r-- | less/tests/forms-responsive.html | 71 | ||||
| -rw-r--r-- | less/type.less | 29 |
4 files changed, 90 insertions, 12 deletions
diff --git a/less/forms.less b/less/forms.less index c155fc004..c9fafec27 100644 --- a/less/forms.less +++ b/less/forms.less @@ -86,6 +86,7 @@ input[type="color"], line-height: @baseLineHeight; color: @gray; .border-radius(@inputBorderRadius); + vertical-align: middle; } // Reset appearance properties for textual inputs and textarea diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 5cd89e403..45ce4ebc7 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -58,6 +58,7 @@ } // Make all grid-sized elements block level again [class*="span"], + .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing .row-fluid [class*="span"] { float: none; display: block; diff --git a/less/tests/forms-responsive.html b/less/tests/forms-responsive.html new file mode 100644 index 000000000..846d5b43d --- /dev/null +++ b/less/tests/forms-responsive.html @@ -0,0 +1,71 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <title>Bootstrap, from Twitter</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="description" content=""> + <meta name="author" content=""> + + <!-- Le styles --> + <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet"> + <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet"> + <style> + body { + padding-top: 30px; + padding-bottom: 30px; + } + </style> + + <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> + <!--[if lt IE 9]> + <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <![endif]--> + + <!-- Le fav and touch icons --> + <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico"> + <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png"> + </head> + + <body> + + <form class="container"> + + <div class="page-header"> + <h1>Fixed grid</h1> + </div> + + <h3>Vertical alignment</h3> + <input type="text" class="span2" placeholder="span2"> + <select class="span2"><option>span2</option></select> + <span class="uneditable-input span2">span1</span> + + <h3>Width across elements</h3> + <div> + <input type="text" class="span2" placeholder="span2"> + </div> + <div> + <select class="span2"><option>span2</option></select> + </div> + <div> + <span class="uneditable-input span2">span2</span> + </div> + + + <div class="page-header"> + <h1>Fluid grid</h1> + </div> + + <div class="row-fluid"> + <input type="text" class="span2" placeholder="span2"> + <select class="span2"><option>span2</option></select> + <span class="uneditable-input span2">span1</span> + </div> + + </form> <!-- /container --> + + </body> +</html> diff --git a/less/type.less b/less/type.less index 512ead99e..2d913dde3 100644 --- a/less/type.less +++ b/less/type.less @@ -57,7 +57,7 @@ h1, h2, h3, h4, h5, h6 { margin: (@baseLineHeight / 2) 0; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; - line-height: 1; + line-height: @baseLineHeight; color: @headingsColor; text-rendering: optimizelegibility; // Fix the character spacing for headings small { @@ -66,17 +66,22 @@ h1, h2, h3, h4, h5, h6 { color: @grayLight; } } -h1 { font-size: 36px; line-height: 40px; } -h2 { font-size: 30px; line-height: 40px; } -h3 { font-size: 24px; line-height: 40px; } -h4 { font-size: 18px; line-height: 20px; } -h5 { font-size: 14px; line-height: 20px; } -h6 { font-size: 12px; line-height: 20px; } - -h1 small { font-size: 24px; } -h2 small { font-size: 18px; } -h3 small { font-size: 14px; } -h4 small { font-size: 14px; } + +h1, +h2, +h3 { line-height: @baseLineHeight * 2; } + +h1 { font-size: @baseFontSize * 2.75; } // ~38px +h2 { font-size: @baseFontSize * 2.25; } // ~32px +h3 { font-size: @baseFontSize * 1.75; } // ~24px +h4 { font-size: @baseFontSize * 1.25; } // ~18px +h5 { font-size: @baseFontSize; } +h6 { font-size: @baseFontSize * 0.85; } // ~12px + +h1 small { font-size: @baseFontSize * 1.75; } // ~24px +h2 small { font-size: @baseFontSize * 1.25; } // ~18px +h3 small { font-size: @baseFontSize; } +h4 small { font-size: @baseFontSize; } // Page header |