adding border variable for dropdowns, making dropdown carets use dropdown vars

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 742eceea933a154d9920aca063105284c6aa9db4..2ccbc3cf194585f2627c4c27d3847a9b46ca3f15 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/download.html b/docs/download.html
index efee3ce7acd88697e322b3f87334215cc9836277..6aa113001d11953ae81646d5eab5af9b910fbda0 100644 (file)
--- 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 c700632aeeff8bae38f824b112d326b301866a9b..87fdc6a3835e319491392c6d0104b52ac44f4940 100644 (file)
--- 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 d443a37d05270c11641441f65c85a9444fcc0e2e..8eb1332ae65e455fcc00b13a3e55cece61b946ef 100644 (file)
--- 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 c4614dd766bd972fcba9a27a28c25dd8330d1dec..94c3a0667c1b636ea7cee41c5567b3f617cd0238 100644 (file)
--- 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;