Merge remote-tracking branch 'upstream/master' into 455_linkify

2017-02-17 10:05:22 -08:00
parent c4f431849b ade3389cea
commit a14a0834e9
22 changed files with 4518 additions and 5526 deletions
@@ -97,13 +97,10 @@
 }

@keyframes xterm-cursor-blink {
-    0% {
-        background-color: #fff;
-        color: #000;
-    }
+    0% { }
    50% {
        background-color: transparent;
-        color: #FFF;
+        color: inherit;
    }
 }