Merge remote-tracking branch 'origin/JENKINS-22099-progress-bar' into…

… progressbar Conflicts: src/main/webapp/pipe.css
Diabol · Apr 6, 2014 · 525fdaa · 525fdaa
2 parents 25d03ce + 394b26a
commit 525fdaa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/webapp/pipe.css b/src/main/webapp/pipe.css
@@ -204,13 +204,13 @@ section.stage a:hover {
     border-left: 6px solid #0092ef;
 }
 
-.timestamp {
+span.timestamp {
     display: inline-block;
     font-size: 0.8em;
     font-weight: lighter;
 }
 
-.duration {
+span.duration {
     display: inline-block;
     font-size: 0.8em;
     margin-left: 15px;