diff options
| author | Mark Otto <[email protected]> | 2014-01-22 15:37:11 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-22 15:37:11 -0600 |
| commit | e29a3b65cd61e5341447332a3b154a60c075dff9 (patch) | |
| tree | cbedf152a21a461b583a21483e9c0d1065991a7e /less | |
| parent | d1f69d4a7e23abbe8cdbc6ff7e642c0f8d51e624 (diff) | |
| parent | 494014babe34f06dbf6fab9614c52c6cf83a59be (diff) | |
| download | bootstrap-e29a3b65cd61e5341447332a3b154a60c075dff9.tar.xz bootstrap-e29a3b65cd61e5341447332a3b154a60c075dff9.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/less/navbar.less b/less/navbar.less index ac7a6a79f..eea376f59 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -48,7 +48,7 @@ // content for the user's viewport. .navbar-collapse { - max-height: 340px; + max-height: @navbar-collapse-max-height; overflow-x: visible; padding-right: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal; diff --git a/less/variables.less b/less/variables.less index e431f47b3..bbf54b48c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -311,6 +311,7 @@ @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor((@grid-gutter-width / 2)); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-collapse-max-height: 340px; @navbar-default-color: #777; @navbar-default-bg: #f8f8f8; |