Skip to content

Commit

Permalink
fix for font-family wildcard css rule
Browse files Browse the repository at this point in the history
  • Loading branch information
jcubic committed Jun 13, 2020
1 parent a88d91e commit 6145feb
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 24 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.17.3
### Bugfix
* fix for font-family wildcard css rule

## 2.17.2
### Bugfix
* fix cursor on strings in prism
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
__ / / // / // / _ / _/ // / / / _ / _/ / / \/ / _ \/ /
/ / / // / // / ___/ // // / / / ___/ // / / / / /\ / // / /__
\___/____ \\__/____/_/ \__ / /_/____/_//_/_/_/_/_/ \/\__\_\___/
\/ /____/ version 2.17.2
\/ /____/ version DEV
```
http://terminal.jcubic.pl

[![npm](https://img.shields.io/badge/npm-2.17.2-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
![bower](https://img.shields.io/badge/bower-2.17.2-yellow.svg)
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=master&a17d57c623123a5184fe54368ab3fc718f599567)](https://travis-ci.org/jcubic/jquery.terminal)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&51b32c0d59f6eeb46d4c65662e06e08d)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
[![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&a88d91e8ee9cfb8bed60ce5b2a4523803371a6b9)](https://travis-ci.org/jcubic/jquery.terminal)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&51b32c0d59f6eeb46d4c65662e06e08d)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
[![](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded)](https://www.jsdelivr.com/package/npm/jquery.terminal)
[![LICENSE MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/jcubic/jquery.terminal/blob/master/LICENSE)
Expand Down Expand Up @@ -77,20 +77,20 @@ Include jQuery library, you can use cdn from https://jquery.com/download/
```


Then include js/jquery.terminal-2.17.2.min.js and css/jquery.terminal-2.17.2.min.css
Then include js/jquery.terminal-DEV.min.js and css/jquery.terminal-DEV.min.css

You can grab the files from CDN:

```html
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/2.17.2/js/jquery.terminal.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/2.17.2/css/jquery.terminal.min.css" rel="stylesheet"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/js/jquery.terminal.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/css/jquery.terminal.min.css" rel="stylesheet"/>
```

or

```html
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@2.17.2/js/jquery.terminal.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@2.17.2/css/jquery.terminal.min.css">
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/js/jquery.terminal.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/css/jquery.terminal.min.css">
```

If you always want latest version, you can get it from [unpkg](https://unpkg.com/) without specifying version,
Expand Down
9 changes: 6 additions & 3 deletions css/jquery.terminal-2.17.2.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
* \/ /____/ version 2.17.2
* \/ /____/ version DEV
* http://terminal.jcubic.pl
*
* This file is part of jQuery Terminal.
*
* Copyright (c) 2011-2020 Jakub Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Thu, 11 Jun 2020 19:20:15 +0000
* Date: Sat, 13 Jun 2020 07:19:28 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -206,7 +206,10 @@ body.full-screen-terminal .terminal {
}
.terminal,
.terminal-output > :not(.raw),
.cmd {
.terminal-output > :not(.raw) span,
.terminal-output > :not(.raw) a,
.cmd,
.cmd span {
font-family: monospace;
/*font-family: FreeMono, monospace; this don't work on Android */
font-size: 12px;
Expand Down
6 changes: 3 additions & 3 deletions css/jquery.terminal-2.17.2.min.css

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion css/jquery.terminal-src.css
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,10 @@ body.full-screen-terminal .terminal {
}
.terminal,
.terminal-output > :not(.raw),
.cmd {
.terminal-output > :not(.raw) span,
.terminal-output > :not(.raw) a,
.cmd,
.cmd span {
font-family: monospace;
/*font-family: FreeMono, monospace; this don't work on Android */
font-size: 12px;
Expand Down
9 changes: 6 additions & 3 deletions css/jquery.terminal.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
* \/ /____/ version 2.17.2
* \/ /____/ version DEV
* http://terminal.jcubic.pl
*
* This file is part of jQuery Terminal.
*
* Copyright (c) 2011-2020 Jakub Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Thu, 11 Jun 2020 19:20:15 +0000
* Date: Sat, 13 Jun 2020 07:19:28 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -206,7 +206,10 @@ body.full-screen-terminal .terminal {
}
.terminal,
.terminal-output > :not(.raw),
.cmd {
.terminal-output > :not(.raw) span,
.terminal-output > :not(.raw) a,
.cmd,
.cmd span {
font-family: monospace;
/*font-family: FreeMono, monospace; this don't work on Android */
font-size: 12px;
Expand Down
6 changes: 3 additions & 3 deletions css/jquery.terminal.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/jquery.terminal.min.css.map

Large diffs are not rendered by default.

0 comments on commit 6145feb

Please sign in to comment.