Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341

2015-06-24 19:25:27 -07:00
parent 19748ba17c 889ca79c5e
commit 9f137513d9
10 changed files with 307 additions and 37 deletions
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -4857,6 +4857,3 @@ input[type="text"] {
 /* line 32, ../sass/_hide-non-functional.scss */
 .browse-mode .browse-area.holder {
  top: 5px; }
-  /* line 39, ../sass/_hide-non-functional.scss */
-  .browse-mode .browse-area.holder > .contents.split-layout .object-browse-bar .btn.key-window {
-    display: none; }