From 556473fb211a01ec4fbb5b8a23f3c844c236b586 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Thu, 17 Jan 2013 11:30:14 +0000
Subject: [PATCH] Try to get dropdown menus working again

Bootstrap doesn't like the div/span elements left behind by the view
widget
---
 core/styles/tiddlywiki.css | 26 +++++++++-----------------
 cssbuild/tiddlywiki.less   | 26 ++++++++++----------------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/core/styles/tiddlywiki.css b/core/styles/tiddlywiki.css
index ce7a9670f..fde73068b 100644
--- a/core/styles/tiddlywiki.css
+++ b/core/styles/tiddlywiki.css
@@ -6024,7 +6024,7 @@ textarea.tw-edit-field {
   width: 100%;
 }
 
-canvas.tw-edit-field {
+canvas.tw-edit-bitmapeditor {
   cursor: crosshair;
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -6113,22 +6113,14 @@ Dropdown menus
   content: "\2022";
 }
 
-.dropdown-menu {
-  position: static;
-}
-
-.dropdown-menu a {
-  position: relative;
-}
-
-/* This is needed to make the dropdown arrows abut to the dropdown itself */
-
-.navbar .dropdown-menu::before {
-  top: -4px;
-}
-
-.navbar .dropdown-menu::after {
-  top: -3px;
+.dropdown-menu li > .tw-view-link > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
 }
 
 /*
diff --git a/cssbuild/tiddlywiki.less b/cssbuild/tiddlywiki.less
index a8a0d3941..b418f95b1 100644
--- a/cssbuild/tiddlywiki.less
+++ b/cssbuild/tiddlywiki.less
@@ -131,7 +131,7 @@ textarea.tw-edit-field {
 	width: 100%;
 }
 
-canvas.tw-edit-field  {
+canvas.tw-edit-bitmapeditor  {
 	cursor: crosshair;
 	-moz-user-select: none;
 	-webkit-user-select: none;
@@ -218,21 +218,15 @@ Dropdown menus
 	left: 4px;
 }
 
-.dropdown-menu {
-	position: static;
-}
-
-.dropdown-menu a {
-	position: relative;
-}
-
-/* This is needed to make the dropdown arrows abut to the dropdown itself */
-.navbar .dropdown-menu::before {
-	top: -4px;
-}
-.navbar .dropdown-menu::after {
-	top: -3px;
-}
+.dropdown-menu li > .tw-view-link > a {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: @baseLineHeight;
+    color: @dropdownLinkColor;
+    white-space: nowrap;
+  }
 
 /*
 Buttons