Fixed conflict

jeanlyn · May 1, 2015 · 8f6610c · 8f6610c
2 parents b587cf2 + 7fe0f3f
commit 8f6610c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css
@@ -73,6 +73,10 @@ div#application-timeline, div#job-timeline {
   background-color: #FDFFCA;
 }
 
+#application-timeline div.legend-area {
+  margin-top: 5px;
+}
+
 .vis.timeline div.content {
   width: 100%;
 }

diff --git a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
@@ -123,7 +123,8 @@ function drawJobTimeline(groupArray, eventObjArray, startTime) {
           var id = idAndAttempt[0];
           var attempt = idAndAttempt[1];
           $("#stage-" + id + "-" + attempt).removeClass("corresponding-item-hover");
-          $($(this).find("div.job-timeline-content")[0]).tooltip("hide");
+          $($(this).find("div.job-timeline-content")[0])
+          .tooltip("hide");
         }
       );
     });