[themes] Make sure fat cursor backgrounds are specialized for .cm-fat-cursor

marijnh · marijnh · commit 4c6759e15f5d · 2021-06-21T07:58:42.000+02:00
Issue #6714
diff --git a/demo/vim.html b/demo/vim.html
@@ -6,8 +6,6 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="../addon/dialog/dialog.css">
-<link rel="stylesheet" href="../theme/midnight.css">
-<link rel="stylesheet" href="../theme/solarized.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
diff --git a/theme/ayu-dark.css b/theme/ayu-dark.css
@@ -9,6 +9,8 @@
 .cm-s-ayu-dark .CodeMirror-guttermarker-subtle { color: #3d424d; }
 .cm-s-ayu-dark .CodeMirror-linenumber { color: #3d424d; }
 .cm-s-ayu-dark .CodeMirror-cursor { border-left: 1px solid #e6b450; }
+.cm-s-ayu-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-ayu-dark .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
 
 .cm-s-ayu-dark span.cm-comment { color: #626a73; }
 .cm-s-ayu-dark span.cm-atom { color: #ae81ff; }
@@ -40,7 +42,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim mode */
-.cm-s-ayu-dark .CodeMirror-cursor { background-color: #a2a8a175 !important; }
-.cm-s-ayu-dark .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
diff --git a/theme/ayu-mirage.css b/theme/ayu-mirage.css
@@ -9,6 +9,8 @@
 .cm-s-ayu-mirage .CodeMirror-guttermarker-subtle { color:  rgba(112, 122, 140, 66); }
 .cm-s-ayu-mirage .CodeMirror-linenumber { color: rgba(61, 66, 77, 99); }
 .cm-s-ayu-mirage .CodeMirror-cursor { border-left: 1px solid #ffcc66;  }
+.cm-s-ayu-mirage.cm-fat-cursor .CodeMirror-cursor {background-color: #a2a8a175 !important;}
+.cm-s-ayu-mirage .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
 
 .cm-s-ayu-mirage span.cm-comment { color: #5c6773; font-style:italic; }
 .cm-s-ayu-mirage span.cm-atom { color: #ae81ff; }
@@ -41,7 +43,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
- /* changing cursor color in vim mode */
-.cm-s-ayu-mirage .CodeMirror-cursor {background-color: #a2a8a175 !important;}
-.cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
@@ -17,6 +17,8 @@
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
 .cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
 .cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
+.cm-s-base16-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-base16-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
 
 .cm-s-base16-dark span.cm-comment { color: #8f5536; }
 .cm-s-base16-dark span.cm-atom { color: #aa759f; }
@@ -36,8 +38,3 @@
 
 .cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
-
-/* changing cursor color in vim */
-.cm-s-base16-dark .CodeMirror-cursor { background-color: #8e8d8875 !important; }
-.cm-s-base16-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
-
diff --git a/theme/gruvbox-dark.css b/theme/gruvbox-dark.css
@@ -11,6 +11,8 @@
 .cm-s-gruvbox-dark .CodeMirror-gutters {background: #282828; border-right: 0px;}
 .cm-s-gruvbox-dark .CodeMirror-linenumber {color: #7c6f64;}
 .cm-s-gruvbox-dark .CodeMirror-cursor { border-left: 1px solid #ebdbb2; }
+.cm-s-gruvbox-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-gruvbox-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
 .cm-s-gruvbox-dark div.CodeMirror-selected { background: #928374; }
 .cm-s-gruvbox-dark span.cm-meta { color: #83a598; }
 
@@ -35,8 +37,3 @@
 
 .cm-s-gruvbox-dark span.cm-builtin { color: #fe8019; }
 .cm-s-gruvbox-dark span.cm-tag { color: #fe8019; }
-
-/* changing cursor color in vim mode */
-.cm-s-gruvbox-dark .CodeMirror-cursor { background-color: #8e8d8875 !important; }
-.cm-s-gruvbox-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
-
diff --git a/theme/material-ocean.css b/theme/material-ocean.css
@@ -24,6 +24,12 @@
 .cm-s-material-ocean .CodeMirror-cursor {
   border-left: 1px solid #FFCC00;
 }
+.cm-s-material-ocean.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #a2a8a175 !important;
+}
+.cm-s-material-ocean .cm-animate-fat-cursor {
+  background-color: #a2a8a175 !important;
+}
 
 .cm-s-material-ocean div.CodeMirror-selected {
   background: rgba(113, 124, 180, 0.2);
@@ -133,8 +139,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim mode */
-.cm-s-material-ocean .CodeMirror-cursor { background-color: #a2a8a175 !important; }
-.cm-s-material-ocean .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
-
diff --git a/theme/material-palenight.css b/theme/material-palenight.css
@@ -24,6 +24,12 @@
 .cm-s-material-palenight .CodeMirror-cursor {
   border-left: 1px solid #FFCC00;
 }
+.cm-s-material-palenight.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #607c8b80 !important;
+}
+.cm-s-material-palenight .cm-animate-fat-cursor {
+  background-color: #607c8b80 !important;
+}
 
 .cm-s-material-palenight div.CodeMirror-selected {
   background: rgba(113, 124, 180, 0.2);
@@ -133,7 +139,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor colors in vim mode */
-.cm-s-material-palenight .CodeMirror-cursor { background-color: #607c8b80 !important; }
-.cm-s-material-palenight .cm-animate-fat-cursor { background-color: #607c8b80 !important; }
diff --git a/theme/material.css b/theme/material.css
@@ -24,6 +24,12 @@
 .cm-s-material .CodeMirror-cursor {
   border-left: 1px solid #FFCC00;
 }
+.cm-s-material.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #5d6d5c80 !important;
+}
+.cm-s-material .cm-animate-fat-cursor {
+  background-color: #5d6d5c80 !important;
+}
 
 .cm-s-material div.CodeMirror-selected {
   background: rgba(128, 203, 196, 0.2);
@@ -133,8 +139,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim mode */
-.cm-s-material .CodeMirror-cursor { background-color: #5d6d5c80 !important; }
-.cm-s-material .cm-animate-fat-cursor { background-color: #5d6d5c80 !important; }
-
diff --git a/theme/oceanic-next.css b/theme/oceanic-next.css
@@ -16,6 +16,8 @@
 .cm-s-oceanic-next .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-oceanic-next .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-oceanic-next .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+.cm-s-oceanic-next.cm-fat-cursor .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-oceanic-next .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
 
 .cm-s-oceanic-next span.cm-comment { color: #65737E; }
 .cm-s-oceanic-next span.cm-atom { color: #C594C5; }
@@ -42,8 +44,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim */
-.cm-s-oceanic-next .CodeMirror-cursor { background-color: #a2a8a175 !important; }
-.cm-s-oceanic-next .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
-
