Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 13 insertions, 7 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.css b/js/components/layout/document-entry.reel/document-entry.css
index 4601974f..87880b8d 100755
--- a/js/components/layout/document-entry.reel/document-entry.css
+++ b/js/components/layout/document-entry.reel/document-entry.css
@@ -19,7 +19,16 @@
     min-width:0px;
 }
 
-.documentEntry img {
+.documentCloseButton {
+    display: inline;
+    -webkit-appearance: none;
+    outline: none;
+    cursor: pointer;
+    border: 0px;
+    background: #474747 url(../../../../images/documentsTab/close_button.gif) center center no-repeat;
+}
+
+.documentEntry button {
     opacity: 0.5; /* 50% */
     width: 12px;
     max-width:12px;
@@ -29,17 +38,14 @@
     transition: opacity 0.2s ease;
 }
 
-.documentEntry:hover,
-.documentEntry:active,
-.documentEntry.activeTab {
-    /*background-color: #7f7f7f; *//* rgb(127, 127, 127); */
+.documentEntry.selected {
+    background-color:#7F7F7F;
 }
 
-.documentEntry img:hover {
+.documentEntry button:hover {
     opacity: 1.0; /* 100% */
 }
 
-
 .documentEntry span.dirty:before{
     content: "*";
     display:inline;