merge in master, resolve conflicts

2 files changed, 7 insertions, 17 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2d17370c2..4fbfac9d3 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -195,6 +195,9 @@ div.topbar-wrapper {
 div.topbar-wrapper div.topbar {
   position: absolute;
   margin: 0 -20px;
+}
+
+div.topbar-wrapper div.topbar .fill {
   padding-left: 20px;
   padding-right: 20px;
   -webkit-border-radius: 4px;
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 0de6ca96f..3319e607d 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -42,25 +42,12 @@ $(document).ready(function(){
   // Dropdown example for topbar nav
   // ===============================
 
-  $("body").bind("click", function(e) {
-    $("ul.menu-dropdown").hide();
-    $('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide();
+  $("body").bind("click", function (e) {
+    $('a.menu').parent("li").removeClass("open");
   });
 
-  $("a.menu").click(function(e) {
-    var $target = $(this);
-    var $parent = $target.parent("li");
-    var $siblings = $target.siblings("ul.menu-dropdown");
-    var $parentSiblings = $parent.siblings("li");
-    if ($parent.hasClass("open")) {
-      $parent.removeClass("open");
-      $siblings.hide();
-    } else {
-      $parent.addClass("open");
-      $siblings.show();
-    }
-    $parentSiblings.children("ul.menu-dropdown").hide();
-    $parentSiblings.removeClass("open");
+  $("a.menu").click(function (e) {
+    var $li = $(this).parent("li").toggleClass('open');
     return false;
   });