diff options
| author | Mark Otto <[email protected]> | 2012-03-12 09:57:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-12 09:57:10 -0700 |
| commit | e12c66aabead93f3ac015e6a6aee307185bc7667 (patch) | |
| tree | 8a5f35566ee033b95ef9c303496e0d2157feb58d | |
| parent | 40fddffeec58565eac698de0ed5697fde8a46130 (diff) | |
| download | bootstrap-e12c66aabead93f3ac015e6a6aee307185bc7667.tar.xz bootstrap-e12c66aabead93f3ac015e6a6aee307185bc7667.zip | |
adding border variable for dropdowns, making dropdown carets use dropdown vars
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55526 -> 55526 bytes | |||
| -rw-r--r-- | docs/download.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/download.mustache | 2 | ||||
| -rw-r--r-- | less/navbar.less | 8 | ||||
| -rw-r--r-- | less/variables.less | 1 |
5 files changed, 9 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 742eceea9..2ccbc3cf1 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/download.html b/docs/download.html index efee3ce7a..6aa113001 100644 --- a/docs/download.html +++ b/docs/download.html @@ -339,6 +339,8 @@ <h3>Dropdowns</h3> <label>@dropdownBackground</label> <input type="text" class="span3" placeholder="@white"> + <label>@dropdownBorder</label> + <input type="text" class="span3" placeholder="rgba(0,0,0,.2)"> <label>@dropdownLinkColor</label> <input type="text" class="span3" placeholder="@grayDark"> <label>@dropdownLinkColorHover</label> diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index c700632ae..87fdc6a38 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -263,6 +263,8 @@ <h3>{{_i}}Dropdowns{{/i}}</h3> <label>@dropdownBackground</label> <input type="text" class="span3" placeholder="@white"> + <label>@dropdownBorder</label> + <input type="text" class="span3" placeholder="rgba(0,0,0,.2)"> <label>@dropdownLinkColor</label> <input type="text" class="span3" placeholder="@grayDark"> <label>@dropdownLinkColorHover</label> diff --git a/less/navbar.less b/less/navbar.less index d443a37d0..8eb1332ae 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -270,7 +270,7 @@ border-left: 7px solid transparent; border-right: 7px solid transparent; border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0,0,0,.2); + border-bottom-color: @dropdownBorder; position: absolute; top: -7px; left: 9px; @@ -280,7 +280,7 @@ display: inline-block; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid @white; + border-bottom: 6px solid @dropdownBackground; position: absolute; top: -6px; left: 10px; @@ -290,13 +290,13 @@ .navbar-fixed-bottom .dropdown-menu { &:before { border-top: 7px solid #ccc; - border-top-color: rgba(0, 0, 0, 0.2); + border-top-color: @dropdownBorder; border-bottom: 0; bottom: -7px; top: auto; } &:after { - border-top: 6px solid #ffffff; + border-top: 6px solid @dropdownBackground; border-bottom: 0; bottom: -6px; top: auto; diff --git a/less/variables.less b/less/variables.less index c4614dd76..94c3a0667 100644 --- a/less/variables.less +++ b/less/variables.less @@ -98,6 +98,7 @@ // Dropdowns // ------------------------- @dropdownBackground: @white; +@dropdownBorder: rgba(0,0,0,.2); @dropdownLinkColor: @grayDark; @dropdownLinkColorHover: @white; @dropdownLinkBackgroundHover: @linkColor; |