Skip to content

Commit

Permalink
fix height of the terminal when --rows not used #962
Browse files Browse the repository at this point in the history
  • Loading branch information
jcubic committed Sep 8, 2024
1 parent cebc63d commit 4c696ac
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 23 deletions.
2 changes: 1 addition & 1 deletion css/emoji.css

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

7 changes: 4 additions & 3 deletions css/jquery.terminal-2.43.0.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Copyright (c) 2011-2024 Jakub T. Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Sat, 07 Sep 2024 09:54:53 +0000
* Date: Sun, 08 Sep 2024 09:53:47 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -839,8 +839,9 @@ terminal .terminal-output > div {
}
.terminal {
--terminal-line: calc(var(--size, 1) * (16px / var(--pixel-density, 1)) + 1px / var(--pixel-density, 1));
/* force size when user add --rows or --cols */
height: calc((var(--terminal-line) * var(--rows)) + (var(--padding, 10) * 2px)) !important;
height: auto;
/* force size when user add --rows */
height: calc((var(--terminal-line) * var(--rows)) + (var(--padding, 10) * 2px));
}
.terminal .terminal-output > :not(.raw) > div,
.cmd div,
Expand Down
4 changes: 2 additions & 2 deletions css/jquery.terminal-2.43.0.min.css

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions css/jquery.terminal-src.css
Original file line number Diff line number Diff line change
Expand Up @@ -839,8 +839,9 @@ terminal .terminal-output > div {
}
.terminal {
--terminal-line: calc(var(--size, 1) * (16px / var(--pixel-density, 1)) + 1px / var(--pixel-density, 1));
/* force size when user add --rows or --cols */
height: calc((var(--terminal-line) * var(--rows)) + (var(--padding, 10) * 2px)) !important;
height: auto;
/* force size when user add --rows */
height: calc((var(--terminal-line) * var(--rows)) + (var(--padding, 10) * 2px));
}
.terminal .terminal-output > :not(.raw) > div,
.cmd div,
Expand Down
7 changes: 4 additions & 3 deletions css/jquery.terminal.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Copyright (c) 2011-2024 Jakub T. Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Sat, 07 Sep 2024 09:54:53 +0000
* Date: Sun, 08 Sep 2024 09:53:47 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -839,8 +839,9 @@ terminal .terminal-output > div {
}
.terminal {
--terminal-line: calc(var(--size, 1) * (16px / var(--pixel-density, 1)) + 1px / var(--pixel-density, 1));
/* force size when user add --rows or --cols */
height: calc((var(--terminal-line) * var(--rows)) + (var(--padding, 10) * 2px)) !important;
height: auto;
/* force size when user add --rows */
height: calc((var(--terminal-line) * var(--rows)) + (var(--padding, 10) * 2px));
}
.terminal .terminal-output > :not(.raw) > div,
.cmd div,
Expand Down
4 changes: 2 additions & 2 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.

4 changes: 2 additions & 2 deletions js/jquery.terminal-2.43.0.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
* broken image by Sophia Bai from the Noun Project (CC-BY)
*
* Date: Sat, 07 Sep 2024 09:54:52 +0000
* Date: Sun, 08 Sep 2024 09:53:46 +0000
*/
/* global define, Map, BigInt */
/* eslint-disable */
Expand Down Expand Up @@ -5323,7 +5323,7 @@
// -------------------------------------------------------------------------
$.terminal = {
version: '2.43.0',
date: 'Sat, 07 Sep 2024 09:54:52 +0000',
date: 'Sun, 08 Sep 2024 09:53:46 +0000',
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
color_names: [
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
Expand Down
4 changes: 2 additions & 2 deletions js/jquery.terminal-2.43.0.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/jquery.terminal.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
* broken image by Sophia Bai from the Noun Project (CC-BY)
*
* Date: Sat, 07 Sep 2024 09:54:52 +0000
* Date: Sun, 08 Sep 2024 09:53:46 +0000
*/
/* global define, Map, BigInt */
/* eslint-disable */
Expand Down Expand Up @@ -5323,7 +5323,7 @@
// -------------------------------------------------------------------------
$.terminal = {
version: '2.43.0',
date: 'Sat, 07 Sep 2024 09:54:52 +0000',
date: 'Sun, 08 Sep 2024 09:53:46 +0000',
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
color_names: [
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
Expand Down
4 changes: 2 additions & 2 deletions js/jquery.terminal.min.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

0 comments on commit 4c696ac

Please sign in to comment.