Always show outlined block cursor in unfocused state

xtermjs · Aug 2, 2017 · 164f785 · 164f785
1 parent 88881e1
commit 164f785
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/src/xterm.css b/src/xterm.css
@@ -93,7 +93,7 @@
  position: relative;
 }
 
-.terminal.xterm-cursor-style-block:not(.focus) .terminal-cursor {
+.terminal:not(.focus) .terminal-cursor {
  outline: 1px solid #fff;
  outline-offset: -1px;
 }
@@ -103,34 +103,21 @@
  color: #000;
 }
 
-<<<<<<< HEAD
 .terminal.focus.xterm-cursor-style-bar:not(.xterm-cursor-blink-on) .terminal-cursor::before,
 .terminal.focus.xterm-cursor-style-underline:not(.xterm-cursor-blink-on) .terminal-cursor::before {
-=======
-.terminal.xterm-cursor-style-bar:not(.xterm-cursor-blink-on) .terminal-cursor::before,
-.terminal.xterm-cursor-style-underline:not(.xterm-cursor-blink-on) .terminal-cursor::before {
->>>>>>> Make all cursors work under all conditions (focused, unfocused, blink)
  content: '';
  position: absolute;
  background-color: #fff;
 }
 
-<<<<<<< HEAD
 .terminal.focus.xterm-cursor-style-bar:not(.xterm-cursor-blink-on) .terminal-cursor::before {
-=======
-.terminal.xterm-cursor-style-bar:not(.xterm-cursor-blink-on) .terminal-cursor::before {
->>>>>>> Make all cursors work under all conditions (focused, unfocused, blink)
  top: 0;
  left: 0;
  bottom: 0;
  width: 1px;
 }
 
-<<<<<<< HEAD
 .terminal.focus.xterm-cursor-style-underline:not(.xterm-cursor-blink-on) .terminal-cursor::before {
-=======
-.terminal.xterm-cursor-style-underline:not(.xterm-cursor-blink-on) .terminal-cursor::before {
->>>>>>> Make all cursors work under all conditions (focused, unfocused, blink)
  bottom: 0;
  left: 0;
  right: 0;