Skip to content

Commit

Permalink
add images to formatting + less with images #515
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcubic
jcubic committed Aug 22, 2019
1 parent a9150e4 commit 9f79dfd
Show file tree
Hide file tree
Showing 17 changed files with 463 additions and 162 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
### Feature
* new events `onBeforeLogin`, `onAfterLogin`, `onBeforeEcho` and `onAfterEcho`
* inherit of style in nesting formatter (with flag `__inherit__ = true` on `nested_formatting`) [#513](https://github.com/jcubic/jquery.terminal/issues/513)
* image formatting (less with images [#515](https://github.com/jcubic/jquery.terminal/issues/515))
### Bugfix
* add missing `onAfterCommand` and `onBeforeCommand` to d.ts file
* fix Emoji [#514](https://github.com/jcubic/jquery.terminal/issues/514)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ http://terminal.jcubic.pl

[![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&1e389f525b8f438e86184c1067e6bac704cab78a)](https://travis-ci.org/jcubic/jquery.terminal)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&9664017d971ef7c68cd9ba29e8536517)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&a9150e47044bc8cb1dc61b8719ee7f50f9041487)](https://travis-ci.org/jcubic/jquery.terminal)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&2205874d8e81fbf53057a1f24711b3bf)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
[![package quality](http://npm.packagequality.com/shield/jquery.terminal.svg)](http://packagequality.com/#?package=jquery.terminal)
[![](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded)](https://www.jsdelivr.com/package/npm/jquery.terminal)
Expand Down
2 changes: 1 addition & 1 deletion css/emoji.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 32 additions & 3 deletions css/jquery.terminal-2.7.1.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Copyright (c) 2011-2019 Jakub Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Sun, 18 Aug 2019 10:00:46 +0000
* Date: Thu, 22 Aug 2019 19:36:50 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -103,6 +103,7 @@ body.full-screen-terminal .terminal {
}
.terminal > div:not(.terminal-font) {
min-height: 100%;
height: 100%;
}
.terminal > .terminal-resizer, .terminal > .terminal-font .terminal-resizer {
position: absolute;
Expand Down Expand Up @@ -183,7 +184,7 @@ body.full-screen-terminal .terminal {
font-size: 12px;
line-height: 15px;
}
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-inverted):not(.cmd-inverted):not(.terminal-error):not(.emoji),
.cmd span:not(.cmd-inverted):not(.token):not(.emoji) {
color: #aaa;
background-color: #000;
Expand Down Expand Up @@ -613,7 +614,7 @@ terminal .terminal-output > div {
}
@supports (--css: variables) {
.terminal,
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-inverted):not(.cmd-inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) a,
.terminal-output > :not(.raw) div,
.cmd,
Expand Down Expand Up @@ -783,3 +784,31 @@ terminal .terminal-output > div {
}
}
*/
/* style for autocomplete menu */
.cmd .cursor-wrapper ul {
list-style: none;
margin: 0;
padding: 0;
float: left;
position: absolute;
top: 14px;
left: 0;
}
.cmd .cursor-wrapper li {
cursor: pointer;
white-space: nowrap;
}
.cmd .cursor-wrapper li:hover {
background: #aaa;
color: #000;
}
.cursor-wrapper {
position: relative;
}
/* images */
.terminal-output div[style*="100%;"] {
overflow: hidden;
}
.terminal-output img {
display: block;
}
4 changes: 2 additions & 2 deletions css/jquery.terminal-2.7.1.min.css
View file

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions css/jquery.terminal-src.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ body.full-screen-terminal .terminal {
}
.terminal > div:not(.terminal-font) {
min-height: 100%;
height: 100%;
}
.terminal > .terminal-resizer, .terminal > .terminal-font .terminal-resizer {
position: absolute;
Expand Down Expand Up @@ -183,7 +184,7 @@ body.full-screen-terminal .terminal {
font-size: 12px;
line-height: 15px;
}
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-inverted):not(.cmd-inverted):not(.terminal-error):not(.emoji),
.cmd span:not(.cmd-inverted):not(.token):not(.emoji) {
color: #aaa;
background-color: #000;
Expand Down Expand Up @@ -613,7 +614,7 @@ terminal .terminal-output > div {
}
@supports (--css: variables) {
.terminal,
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-inverted):not(.cmd-inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) a,
.terminal-output > :not(.raw) div,
.cmd,
Expand Down Expand Up @@ -803,4 +804,11 @@ terminal .terminal-output > div {
}
.cursor-wrapper {
position: relative;
}
}
/* images */
.terminal-output div[style*="100%;"] {
overflow: hidden;
}
.terminal-output img {
display: block;
}
35 changes: 32 additions & 3 deletions css/jquery.terminal.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Copyright (c) 2011-2019 Jakub Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Sun, 18 Aug 2019 10:00:46 +0000
* Date: Thu, 22 Aug 2019 19:36:50 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -103,6 +103,7 @@ body.full-screen-terminal .terminal {
}
.terminal > div:not(.terminal-font) {
min-height: 100%;
height: 100%;
}
.terminal > .terminal-resizer, .terminal > .terminal-font .terminal-resizer {
position: absolute;
Expand Down Expand Up @@ -183,7 +184,7 @@ body.full-screen-terminal .terminal {
font-size: 12px;
line-height: 15px;
}
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-inverted):not(.cmd-inverted):not(.terminal-error):not(.emoji),
.cmd span:not(.cmd-inverted):not(.token):not(.emoji) {
color: #aaa;
background-color: #000;
Expand Down Expand Up @@ -613,7 +614,7 @@ terminal .terminal-output > div {
}
@supports (--css: variables) {
.terminal,
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-inverted):not(.cmd-inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) a,
.terminal-output > :not(.raw) div,
.cmd,
Expand Down Expand Up @@ -783,3 +784,31 @@ terminal .terminal-output > div {
}
}
*/
/* style for autocomplete menu */
.cmd .cursor-wrapper ul {
list-style: none;
margin: 0;
padding: 0;
float: left;
position: absolute;
top: 14px;
left: 0;
}
.cmd .cursor-wrapper li {
cursor: pointer;
white-space: nowrap;
}
.cmd .cursor-wrapper li:hover {
background: #aaa;
color: #000;
}
.cursor-wrapper {
position: relative;
}
/* images */
.terminal-output div[style*="100%;"] {
overflow: hidden;
}
.terminal-output img {
display: block;
}
Loading

0 comments on commit 9f79dfd

Please sign in to comment.