Skip to content

Commit

Permalink
css teak + prefix terminal classes #510
Browse files Browse the repository at this point in the history
  • Loading branch information
jcubic committed Aug 10, 2019
1 parent 702484c commit 942838d
Show file tree
Hide file tree
Showing 14 changed files with 159 additions and 115 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## 2.6.4
## 2.7.0
### Breaking/Feature
* all classes are prefixed with `cmd` or `terminal` except `.token` (PrimsJS internals) and `.emoji` (this may be feature that fix some bugs, that also may break user code - but it's internal html structure and it's not documented as API) [#510](https://github.com/jcubic/jquery.terminal/issues/510)
### Bugfix
* fix issue with space in IE and Edge [#507](https://github.com/jcubic/jquery.terminal/issues/507)

Expand Down
4 changes: 2 additions & 2 deletions README.md
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&8aef5cb2ac7c56715ae36671b0c2612d6a7d5af5)](https://travis-ci.org/jcubic/jquery.terminal)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&cd37915280610121393bb2cc331145d8)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&9b61c2aca23b1a279c7a1dc1582fd6bc603ad478)](https://travis-ci.org/jcubic/jquery.terminal)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&31be8ed822021150be479d7c76989ab9)](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
25 changes: 14 additions & 11 deletions css/jquery.terminal-2.6.3.css
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: Sat, 10 Aug 2019 10:59:51 +0000
* Date: Sat, 10 Aug 2019 12:27:36 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -81,7 +81,7 @@
overflow-y: auto;
/* overflow-x: hidden; */
}
terminal.temp {
terminal.terminal-temp {
visibility: hidden;
}
.terminal {
Expand All @@ -101,10 +101,10 @@ body.terminal, body.full-screen-terminal {
body.full-screen-terminal .terminal {
height: 100%;
}
.terminal > div:not(.font) {
.terminal > div:not(.terminal-font) {
min-height: 100%;
}
.terminal > .resizer, .terminal > .font .resizer {
.terminal > .terminal-resizer, .terminal > .terminal-font .terminal-resizer {
position: absolute;
top: 0;
right: 0;
Expand All @@ -130,7 +130,7 @@ body.full-screen-terminal .terminal {
outline: none;
}
.terminal .inverted, .cmd .inverted,
.terminal .term-inverted, .cmd .cmd-inverted {
.terminal .terminal-inverted, .cmd .cmd-inverted {
background-color: #aaa;
color: #000;
}
Expand Down Expand Up @@ -183,7 +183,7 @@ body.full-screen-terminal .terminal {
font-size: 12px;
line-height: 15px;
}
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.cmd span:not(.cmd-inverted):not(.token):not(.emoji) {
color: #aaa;
background-color: #000;
Expand Down Expand Up @@ -226,7 +226,7 @@ terminal .terminal-output > div {
overflow-wrap: break-word;
word-wrap: break-word;
}
.terminal .font {
.terminal .terminal-font {
position: absolute;
float: left;
font-size: inherit;
Expand Down Expand Up @@ -549,8 +549,8 @@ terminal .terminal-output > div {
color: #000;
}

.terminal .terminal-output > :not(.raw) .error,
.terminal .terminal-output > :not(.raw) .error * {
.terminal .terminal-output > :not(.raw) .terminal-error,
.terminal .terminal-output > :not(.raw) .terminal-error * {
color: red;
color: var(--error-color, red);
}
Expand Down Expand Up @@ -607,7 +607,7 @@ terminal .terminal-output > div {
}
@supports (--css: variables) {
.terminal,
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) a,
.terminal-output > :not(.raw) div,
.cmd,
Expand All @@ -632,7 +632,10 @@ terminal .terminal-output > div {
.cmd span,
.cmd div {
font-size: calc(var(--size, 1) * 12px);
line-height: calc(var(--size, 1) * 14px + 1px);
/* TODO: investigate + 1px below that create space in selection it suppose to fix
* cutting off underlines
*/
line-height: calc(var(--size, 1) * 14px);
}
.terminal-output > :not(.raw) .emoji, .cmd .emoji {
height: calc(var(--size, 1) * 14px);
Expand Down
4 changes: 2 additions & 2 deletions css/jquery.terminal-2.6.3.min.css

Large diffs are not rendered by default.

23 changes: 13 additions & 10 deletions css/jquery.terminal-src.css
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
overflow-y: auto;
/* overflow-x: hidden; */
}
terminal.temp {
terminal.terminal-temp {
visibility: hidden;
}
.terminal {
Expand All @@ -101,10 +101,10 @@ body.terminal, body.full-screen-terminal {
body.full-screen-terminal .terminal {
height: 100%;
}
.terminal > div:not(.font) {
.terminal > div:not(.terminal-font) {
min-height: 100%;
}
.terminal > .resizer, .terminal > .font .resizer {
.terminal > .terminal-resizer, .terminal > .terminal-font .terminal-resizer {
position: absolute;
top: 0;
right: 0;
Expand All @@ -130,7 +130,7 @@ body.full-screen-terminal .terminal {
outline: none;
}
.terminal .inverted, .cmd .inverted,
.terminal .term-inverted, .cmd .cmd-inverted {
.terminal .terminal-inverted, .cmd .cmd-inverted {
background-color: #aaa;
color: #000;
}
Expand Down Expand Up @@ -183,7 +183,7 @@ body.full-screen-terminal .terminal {
font-size: 12px;
line-height: 15px;
}
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.cmd span:not(.cmd-inverted):not(.token):not(.emoji) {
color: #aaa;
background-color: #000;
Expand Down Expand Up @@ -226,7 +226,7 @@ terminal .terminal-output > div {
overflow-wrap: break-word;
word-wrap: break-word;
}
.terminal .font {
.terminal .terminal-font {
position: absolute;
float: left;
font-size: inherit;
Expand Down Expand Up @@ -549,8 +549,8 @@ terminal .terminal-output > div {
color: #000;
}

.terminal .terminal-output > :not(.raw) .error,
.terminal .terminal-output > :not(.raw) .error * {
.terminal .terminal-output > :not(.raw) .terminal-error,
.terminal .terminal-output > :not(.raw) .terminal-error * {
color: red;
color: var(--error-color, red);
}
Expand Down Expand Up @@ -607,7 +607,7 @@ terminal .terminal-output > div {
}
@supports (--css: variables) {
.terminal,
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) a,
.terminal-output > :not(.raw) div,
.cmd,
Expand All @@ -632,7 +632,10 @@ terminal .terminal-output > div {
.cmd span,
.cmd div {
font-size: calc(var(--size, 1) * 12px);
line-height: calc(var(--size, 1) * 14px + 1px);
/* TODO: investigate + 1px below that create space in selection it suppose to fix
* cutting off underlines
*/
line-height: calc(var(--size, 1) * 14px);
}
.terminal-output > :not(.raw) .emoji, .cmd .emoji {
height: calc(var(--size, 1) * 14px);
Expand Down
25 changes: 14 additions & 11 deletions css/jquery.terminal.css
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: Sat, 10 Aug 2019 10:59:51 +0000
* Date: Sat, 10 Aug 2019 12:27:36 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -81,7 +81,7 @@
overflow-y: auto;
/* overflow-x: hidden; */
}
terminal.temp {
terminal.terminal-temp {
visibility: hidden;
}
.terminal {
Expand All @@ -101,10 +101,10 @@ body.terminal, body.full-screen-terminal {
body.full-screen-terminal .terminal {
height: 100%;
}
.terminal > div:not(.font) {
.terminal > div:not(.terminal-font) {
min-height: 100%;
}
.terminal > .resizer, .terminal > .font .resizer {
.terminal > .terminal-resizer, .terminal > .terminal-font .terminal-resizer {
position: absolute;
top: 0;
right: 0;
Expand All @@ -130,7 +130,7 @@ body.full-screen-terminal .terminal {
outline: none;
}
.terminal .inverted, .cmd .inverted,
.terminal .term-inverted, .cmd .cmd-inverted {
.terminal .terminal-inverted, .cmd .cmd-inverted {
background-color: #aaa;
color: #000;
}
Expand Down Expand Up @@ -183,7 +183,7 @@ body.full-screen-terminal .terminal {
font-size: 12px;
line-height: 15px;
}
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.cmd span:not(.cmd-inverted):not(.token):not(.emoji) {
color: #aaa;
background-color: #000;
Expand Down Expand Up @@ -226,7 +226,7 @@ terminal .terminal-output > div {
overflow-wrap: break-word;
word-wrap: break-word;
}
.terminal .font {
.terminal .terminal-font {
position: absolute;
float: left;
font-size: inherit;
Expand Down Expand Up @@ -549,8 +549,8 @@ terminal .terminal-output > div {
color: #000;
}

.terminal .terminal-output > :not(.raw) .error,
.terminal .terminal-output > :not(.raw) .error * {
.terminal .terminal-output > :not(.raw) .terminal-error,
.terminal .terminal-output > :not(.raw) .terminal-error * {
color: red;
color: var(--error-color, red);
}
Expand Down Expand Up @@ -607,7 +607,7 @@ terminal .terminal-output > div {
}
@supports (--css: variables) {
.terminal,
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.error):not(.emoji),
.terminal-output > :not(.raw) span:not(.token):not(.inverted):not(.terminal-error):not(.emoji),
.terminal-output > :not(.raw) a,
.terminal-output > :not(.raw) div,
.cmd,
Expand All @@ -632,7 +632,10 @@ terminal .terminal-output > div {
.cmd span,
.cmd div {
font-size: calc(var(--size, 1) * 12px);
line-height: calc(var(--size, 1) * 14px + 1px);
/* TODO: investigate + 1px below that create space in selection it suppose to fix
* cutting off underlines
*/
line-height: calc(var(--size, 1) * 14px);
}
.terminal-output > :not(.raw) .emoji, .cmd .emoji {
height: calc(var(--size, 1) * 14px);
Expand Down
Loading

0 comments on commit 942838d

Please sign in to comment.