Merge pull request #1778 from anotherchrisberry/revert-some-menus

revert overzealous dropdown menu styling
spinnaker · Dec 4, 2015 · 1f60e2b · 1f60e2b
2 parents 90830c5 + 2417670
commit 1f60e2b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/scripts/modules/core/presentation/details.less b/app/scripts/modules/core/presentation/details.less
@@ -136,7 +136,7 @@
         }
       }
 
-      .dropdown-menu {
+      .uib-dropdown-menu {
         min-width: 80px;
       }
     }

diff --git a/app/scripts/modules/core/search/global/globalSearch.directive.html b/app/scripts/modules/core/search/global/globalSearch.directive.html
@@ -13,12 +13,12 @@
       </div>
     </div>
   </form>
-  <ul class="uib-dropdown-menu"
+  <ul class="dropdown-menu"
       role="menu"
       ng-if="querying">
     <li class="loader">searching..</li>
   </ul>
-  <ul class="uib-dropdown-menu"
+  <ul class="dropdown-menu"
       role="menu"
       ng-if="!querying && showRecentItems">
     <li ng-repeat-start="category in recentItems" class="category-heading">
@@ -36,7 +36,7 @@
       </a>
     </li>
   </ul>
-  <ul class="uib-dropdown-menu"
+  <ul class="dropdown-menu"
       role="menu"
       ng-if="!querying && showSearchResults">
     <li ng-repeat-start="category in categories | orderBy: 'order'" class="category-heading">

diff --git a/app/scripts/modules/netflix/feedback/feedback.html b/app/scripts/modules/netflix/feedback/feedback.html
@@ -6,7 +6,7 @@
     <a href class="dropdown-toggle" ng-click="toggleMenu()">
       <span class="glyphicon glyphicon-comment"></span> <span class="hidden-xs hidden-sm">Feedback</span>
     </a>
-    <ul class="uib-dropdown-menu">
+    <ul class="dropdown-menu">
       <li>
         <a href ng-click="openFeedback(); toggleMenu();">
           <span class="glyphicon glyphicon-envelope"></span>
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,7 +136,7 @@ @@
             }
           }
-          .dropdown-menu {
+          .uib-dropdown-menu {
             min-width: 80px;
           }
         }
@@ Expand Down @@