better fix to wildcard selector that change font

jcubic · Nov 3, 2018 · c815694 · c815694
1 parent 18a9c5c
commit c815694
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * fix keep focus into cursor feature added in 2.0 (up arrow was causing scroll to top) report in firebase chat
 * don't add empty string to history
 * fix bottom padding in FireFox
+* don't overwrite wildcard selector that change font with wildcard selector (reported by @ovk on gitter)
 
 ## 2.0.0
 ### Breaking

diff --git a/css/jquery.terminal-2.0.0.css b/css/jquery.terminal-2.0.0.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Sat, 03 Nov 2018 07:46:19 +0000
+ * Date: Sat, 03 Nov 2018 07:55:09 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -183,7 +183,13 @@ body.full-screen-terminal .terminal {
 .cmd .prompt > span {
     float: left;
 }
-.terminal, .terminal-wrapper *, .cmd, .cmd * {
+.terminal,
+.terminal-wrapper > :not(.raw) span,
+.terminal-wrapper > :not(.raw) a,
+.terminal-wrapper > :not(.raw) div,
+.cmd,
+.cmd span,
+.cmd div {
     font-family: monospace;
     /*font-family: FreeMono, monospace; this don't work on Android */
     color: #aaa;
@@ -591,7 +597,13 @@ terminal .terminal-output > div {
         width: calc(var(--length, 1) * var(--char-width, 7.23438) * 1px);
         display: inline-block;
     }
-    .terminal, .terminal *, .cmd, .cmd * {
+    .terminal,
+    .terminal-wrapper > :not(.raw) span,
+    .terminal-wrapper > :not(.raw) a,
+    .terminal-wrapper > :not(.raw) div,
+    .cmd,
+    .cmd span,
+    .cmd div {
         font-size: calc(var(--size, 1) * 12px);
         line-height: calc(var(--size, 1) * 15px);
     }

diff --git a/css/jquery.terminal-2.0.0.min.css b/css/jquery.terminal-2.0.0.min.css
diff --git a/css/jquery.terminal-src.css b/css/jquery.terminal-src.css
@@ -183,7 +183,13 @@ body.full-screen-terminal .terminal {
 .cmd .prompt > span {
     float: left;
 }
-.terminal, .terminal-wrapper *, .cmd, .cmd * {
+.terminal,
+.terminal-wrapper > :not(.raw) span,
+.terminal-wrapper > :not(.raw) a,
+.terminal-wrapper > :not(.raw) div,
+.cmd,
+.cmd span,
+.cmd div {
     font-family: monospace;
     /*font-family: FreeMono, monospace; this don't work on Android */
     color: #aaa;
@@ -591,7 +597,13 @@ terminal .terminal-output > div {
         width: calc(var(--length, 1) * var(--char-width, 7.23438) * 1px);
         display: inline-block;
     }
-    .terminal, .terminal *, .cmd, .cmd * {
+    .terminal,
+    .terminal-wrapper > :not(.raw) span,
+    .terminal-wrapper > :not(.raw) a,
+    .terminal-wrapper > :not(.raw) div,
+    .cmd,
+    .cmd span,
+    .cmd div {
         font-size: calc(var(--size, 1) * 12px);
         line-height: calc(var(--size, 1) * 15px);
     }

diff --git a/css/jquery.terminal.css b/css/jquery.terminal.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Sat, 03 Nov 2018 07:46:19 +0000
+ * Date: Sat, 03 Nov 2018 07:55:09 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -183,7 +183,13 @@ body.full-screen-terminal .terminal {
 .cmd .prompt > span {
     float: left;
 }
-.terminal, .terminal-wrapper *, .cmd, .cmd * {
+.terminal,
+.terminal-wrapper > :not(.raw) span,
+.terminal-wrapper > :not(.raw) a,
+.terminal-wrapper > :not(.raw) div,
+.cmd,
+.cmd span,
+.cmd div {
     font-family: monospace;
     /*font-family: FreeMono, monospace; this don't work on Android */
     color: #aaa;
@@ -591,7 +597,13 @@ terminal .terminal-output > div {
         width: calc(var(--length, 1) * var(--char-width, 7.23438) * 1px);
         display: inline-block;
     }
-    .terminal, .terminal *, .cmd, .cmd * {
+    .terminal,
+    .terminal-wrapper > :not(.raw) span,
+    .terminal-wrapper > :not(.raw) a,
+    .terminal-wrapper > :not(.raw) div,
+    .cmd,
+    .cmd span,
+    .cmd div {
         font-size: calc(var(--size, 1) * 12px);
         line-height: calc(var(--size, 1) * 15px);
     }

diff --git a/css/jquery.terminal.min.css b/css/jquery.terminal.min.css
diff --git a/css/jquery.terminal.min.css.map b/css/jquery.terminal.min.css.map