Fix merge conflict

2015-02-27 17:52:51 +01:00
parent f304e5efb7 cb535f1cee
commit 5a22eb9542
6 changed files with 79 additions and 4 deletions
@@ -66,6 +66,10 @@
    position: absolute;
    bottom: 0;
    width: 100%;
+
+    &.clickable {
+        cursor: pointer;
+    }
 }
 .timeline div.interval:hover {
    background: #9C4274;
@@ -206,6 +210,19 @@ input.textFilter {
    background: #f1c40f;
 }

+.table > div.highlight {
+    > div.startTime {
+        background-color: #C0F090;
+    }
+}
+.table > div.highlight-remove {
+    transition: 3s;
+
+    > div.startTime {
+        transition: background-color 3s ease-in;
+    }
+}
+
 .table > div > .index {
    color: #bbb;
    word-break: normal;