diff options
| author | Jacob Thornton <[email protected]> | 2012-08-02 16:58:51 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-02 16:58:51 -0700 |
| commit | 88deb08ff27db0e016e0c030dce072f07b6bc7f4 (patch) | |
| tree | 710d29ba11c0f8c6ebe47cc69853d87f859ecff5 /less | |
| parent | 2b2b3303e1e93d627bf57d145173a523d991803c (diff) | |
| parent | d27dcf3b070015aca81d86de00e1b2ea6e0f30ff (diff) | |
| download | bootstrap-88deb08ff27db0e016e0c030dce072f07b6bc7f4.tar.xz bootstrap-88deb08ff27db0e016e0c030dce072f07b6bc7f4.zip | |
Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 6 | ||||
| -rw-r--r-- | less/tests/css-tests.html | 49 |
2 files changed, 40 insertions, 15 deletions
diff --git a/less/mixins.less b/less/mixins.less index 96ce23eca..1b2f0bcfb 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -175,9 +175,13 @@ textarea { color: @textColor; border-color: @borderColor; + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work &:focus { border-color: darken(@borderColor, 10%); - .box-shadow(0 0 6px lighten(@borderColor, 20%)); + // Write out in full since the lighten() function isn't easily escaped + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); } } // Give a small background color for input-prepend/-append diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 8d9785187..6786454cc 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -818,6 +818,30 @@ <br> +<h4>Fluid textarea at .span12</h4> +<div class="row-fluid"> + <div class="span12"> + <textarea class="span12"></textarea> + </div> +</div> + + +<br> + + +<h4>Selects</h4> +<form> + <select class="span4"> + <option>Option</option> + </select> +</form> + + +<br> + + + + <!-- Dropdowns ================================================== --> @@ -1009,6 +1033,7 @@ </div> </div> <!-- /tabbable --> +<br> <!-- Labels @@ -1035,13 +1060,14 @@ </div><!--/span--> </div><!--/row--> +<br> <!-- Button groups ================================================== --> <div class="page-header"> - <h1>Button groups</h1> + <h1>Buttons</h1> </div> <table class="table table-bordered"> @@ -1062,6 +1088,14 @@ </tbody> </table> +<h4>Mini buttons: text and icon</h4> +<div class="btn-group"> + <button class="btn btn-mini">Button text</button> + <button class="btn btn-mini"><i class="icon-cog"></i></button> +</div> + +<br> + <!-- Responsive utility classes @@ -1098,19 +1132,6 @@ -<br> -<br> -<br> - - - <h4>Fluid textarea at .span12</h4> - <div class="row-fluid"> - <div class="span12"> - <textarea class="span12"></textarea> - </div> - </div> - - </div><!-- /container --> |