diff options
| author | Jacob Thornton <[email protected]> | 2012-04-16 15:09:26 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-16 15:09:26 -0700 |
| commit | 457859feba3ca9a64a23dd38a4d65e3faad11b04 (patch) | |
| tree | 988a2054ece443f35d3e83f65013288a3eb08753 /less | |
| parent | 498b7d984a8182442e2f543eedff6542c628cd55 (diff) | |
| parent | 5fa0fcc888bdeb5210b03445045ba61bdf7b0034 (diff) | |
| download | bootstrap-457859feba3ca9a64a23dd38a4d65e3faad11b04.tar.xz bootstrap-457859feba3ca9a64a23dd38a4d65e3faad11b04.zip | |
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 3 | ||||
| -rw-r--r-- | less/mixins.less | 2 | ||||
| -rw-r--r-- | less/tests/css-tests.html | 16 | ||||
| -rw-r--r-- | less/variables.less | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/less/forms.less b/less/forms.less index dd18b91f5..409de0a24 100644 --- a/less/forms.less +++ b/less/forms.less @@ -331,6 +331,9 @@ select:focus:required:invalid { border-color: #eee; .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); cursor: not-allowed; + // prevent text from wrapping, but still cut it off like an input does + overflow: hidden; + white-space: nowrap; } // Placeholder text gets special styles; can't be bundled together though for some reason diff --git a/less/mixins.less b/less/mixins.less index da461a23a..ff6a34a63 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -545,7 +545,7 @@ .offsetX (0) {} .offset (@columns) { - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)); } .span (@columns) { diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 8dad598c9..58e25be61 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -374,6 +374,19 @@ </ul> </li> </ul> + +<h4>Dropdown on a button</h4> +<div style="position: relative;"> + <button class="btn" type="button" data-toggle="dropdown">Dropdown <span class="caret"></span></button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> +</div> + <br> @@ -445,6 +458,7 @@ </div> + <!-- Tabs ================================================== --> @@ -491,6 +505,8 @@ + + <!-- Footer ================================================== --> <footer class="footer"> diff --git a/less/variables.less b/less/variables.less index a9e3d4082..279c163f1 100644 --- a/less/variables.less +++ b/less/variables.less @@ -197,8 +197,6 @@ @gridColumns: 12; @gridColumnWidth: 60px; @gridGutterWidth: 20px; -@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); - // Fluid grid // ------------------------- |