Skip to content

Commit

Permalink
fix too tall cursor (blink included underline)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcubic
jcubic committed Sep 18, 2018
1 parent 3dc992b commit c7a4964
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 73 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.23.2
### Bugfix
* fix too tall cursor (blink included underline)

## 1.23.1
### Bugfix
* fix cursor when terminal is empty
Expand Down
46 changes: 23 additions & 23 deletions css/jquery.terminal-1.23.1.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
* Released under the MIT license
*
* Date: Mon, 17 Sep 2018 22:01:48 +0000
* Date: Tue, 18 Sep 2018 14:15:43 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
Expand Down Expand Up @@ -46,7 +46,7 @@
opacity: 0.01;
filter: alpha(opacity = 0.01);
filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.01);*/
background: transparent;
background-color: transparent;
border: none;
color: transparent;
outline: none;
Expand Down Expand Up @@ -134,7 +134,7 @@ body.terminal {
position: absolute;
top: 0;
margin-left: -1px;
background: inherit;
background-color: inherit;
color: inherit;
}
.cmd .cursor-line > span {
Expand Down Expand Up @@ -223,7 +223,7 @@ terminal .terminal-output > div {
border: 1px solid #aaa;
}
.cmd span[data-text] span {
background: inherit;
background-color: inherit;
color: inherit;
}
/*
Expand All @@ -235,49 +235,49 @@ terminal .terminal-output > div {
}
@-webkit-keyframes terminal-blink {
0%, 50% {
background: #bbb;
background: var(--original-color, #bbb);
background-color: #bbb;
background-color: var(--original-color, #bbb);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
@-ms-keyframes terminal-blink {
0%, 50% {
background: #bbb;
background: var(--original-color, #bbb);
background-color: #bbb;
background-color: var(--original-color, #bbb);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
@-moz-keyframes terminal-blink {
0%, 50% {
background: #aaa;
background: var(--original-color, #aaa);
background-color: #aaa;
background-color: var(--original-color, #aaa);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
@keyframes terminal-blink {
0%, 50% {
background: #aaa;
background: var(--original-color, #aaa);
background-color: #aaa;
background-color: var(--original-color, #aaa);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
Expand Down Expand Up @@ -413,11 +413,11 @@ terminal .terminal-output > div {
}
@keyframes terminal-blink {
0%, 50% {
background: var(--original-color, #aaa);
background-color: var(--original-color, #aaa);
color: var(--background, #000);
}
50.1%, 100% {
background: var(--background, #000);
background-color: var(--background, #000);
color: var(--original-color, #aaa);
}
}
Expand Down Expand Up @@ -452,11 +452,11 @@ terminal .terminal-output > div {
}
@-ms-keyframes terminal-blink {
0%, 50% {
background: #aaa;
background-color: #aaa;
color: #000;
}
50.1%, 100% {
background: #000;
background-color: #000;
color: #aaa;
}
}
Expand Down Expand Up @@ -542,8 +542,8 @@ terminal .terminal-output > div {
color: var(--link-color, #0F60FF);
}
.terminal a:hover {
background: #0F60FF;
background: var(--link-color, #0F60FF);
background-color: #0F60FF;
background-color: var(--link-color, #0F60FF);
color: var(--background, #000);
text-decoration: none;
}
Expand Down Expand Up @@ -684,5 +684,5 @@ terminal .terminal-output > div {
.cmd .token.string,
.cmd .style .token.string,
.cmd .token.token {
background: inherit;
background-color: inherit;
}
4 changes: 2 additions & 2 deletions css/jquery.terminal-1.23.1.min.css
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions css/jquery.terminal-src.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
opacity: 0.01;
filter: alpha(opacity = 0.01);
filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0.01);*/
background: transparent;
background-color: transparent;
border: none;
color: transparent;
outline: none;
Expand Down Expand Up @@ -134,7 +134,7 @@ body.terminal {
position: absolute;
top: 0;
margin-left: -1px;
background: inherit;
background-color: inherit;
color: inherit;
}
.cmd .cursor-line > span {
Expand Down Expand Up @@ -223,7 +223,7 @@ terminal .terminal-output > div {
border: 1px solid #aaa;
}
.cmd span[data-text] span {
background: inherit;
background-color: inherit;
color: inherit;
}
/*
Expand All @@ -235,49 +235,49 @@ terminal .terminal-output > div {
}
@-webkit-keyframes terminal-blink {
0%, 50% {
background: #bbb;
background: var(--original-color, #bbb);
background-color: #bbb;
background-color: var(--original-color, #bbb);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
@-ms-keyframes terminal-blink {
0%, 50% {
background: #bbb;
background: var(--original-color, #bbb);
background-color: #bbb;
background-color: var(--original-color, #bbb);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
@-moz-keyframes terminal-blink {
0%, 50% {
background: #aaa;
background: var(--original-color, #aaa);
background-color: #aaa;
background-color: var(--original-color, #aaa);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
@keyframes terminal-blink {
0%, 50% {
background: #aaa;
background: var(--original-color, #aaa);
background-color: #aaa;
background-color: var(--original-color, #aaa);
color: #000;
color: var(--background, #000);
}
50.1%, 100% {
background: inherit;
background-color: inherit;
color: inherit;
}
}
Expand Down Expand Up @@ -413,11 +413,11 @@ terminal .terminal-output > div {
}
@keyframes terminal-blink {
0%, 50% {
background: var(--original-color, #aaa);
background-color: var(--original-color, #aaa);
color: var(--background, #000);
}
50.1%, 100% {
background: var(--background, #000);
background-color: var(--background, #000);
color: var(--original-color, #aaa);
}
}
Expand Down Expand Up @@ -452,11 +452,11 @@ terminal .terminal-output > div {
}
@-ms-keyframes terminal-blink {
0%, 50% {
background: #aaa;
background-color: #aaa;
color: #000;
}
50.1%, 100% {
background: #000;
background-color: #000;
color: #aaa;
}
}
Expand Down Expand Up @@ -542,8 +542,8 @@ terminal .terminal-output > div {
color: var(--link-color, #0F60FF);
}
.terminal a:hover {
background: #0F60FF;
background: var(--link-color, #0F60FF);
background-color: #0F60FF;
background-color: var(--link-color, #0F60FF);
color: var(--background, #000);
text-decoration: none;
}
Expand Down Expand Up @@ -684,5 +684,5 @@ terminal .terminal-output > div {
.cmd .token.string,
.cmd .style .token.string,
.cmd .token.token {
background: inherit;
background-color: inherit;
}
Loading

0 comments on commit c7a4964

Please sign in to comment.