diff --git a/html_orig/css/app.css b/html_orig/css/app.css index d09050c..78b1336 100644 --- a/html_orig/css/app.css +++ b/html_orig/css/app.css @@ -1152,7 +1152,7 @@ body.term #screen { -ms-user-select: none; user-select: none; font-family: monospace; - font-size: 16pt; + font-size: 20px; white-space: nowrap; background: #111213; padding: 6px; @@ -1160,12 +1160,11 @@ body.term #screen { border: 2px solid #3983CD; } body.term #screen span { white-space: pre; - cursor: pointer; } - body.term #screen span:hover { - outline: 1px solid rgba(255, 255, 255, 0.4); } - @media screen and (max-width: 544px) { - body.term #screen span:hover { - outline: 0 none; } } + cursor: pointer; + display: inline-block; + line-height: 1.15em; + width: 0.6em; + overflow: visible; } body.term #buttons { margin-top: 10px; white-space: nowrap; } diff --git a/html_orig/js/app.js b/html_orig/js/app.js index 8b344cb..edd6e14 100644 --- a/html_orig/js/app.js +++ b/html_orig/js/app.js @@ -1726,7 +1726,7 @@ var Screen = (function () { // blink attribute setInterval(function () { $('#screen').removeClass('blink-hide'); - setTimeout(function() { + setTimeout(function () { $('#screen').addClass('blink-hide'); }, 800); // 200 ms ON }, 1000); diff --git a/html_orig/jssrc/term.js b/html_orig/jssrc/term.js index 711010f..313b8e1 100644 --- a/html_orig/jssrc/term.js +++ b/html_orig/jssrc/term.js @@ -169,7 +169,7 @@ var Screen = (function () { // blink attribute setInterval(function () { $('#screen').removeClass('blink-hide'); - setTimeout(function() { + setTimeout(function () { $('#screen').addClass('blink-hide'); }, 800); // 200 ms ON }, 1000); diff --git a/html_orig/sass/pages/_term.scss b/html_orig/sass/pages/_term.scss index 4569c9b..e57e3b3 100755 --- a/html_orig/sass/pages/_term.scss +++ b/html_orig/sass/pages/_term.scss @@ -17,7 +17,7 @@ body.term { #screen { @include noselect(); font-family: monospace; - font-size: 16pt; + font-size: 20px;//16pt; - 16pt causes vertical breaks in line drawing characters?? white-space: nowrap; background: #111213; padding: 6px; @@ -27,12 +27,11 @@ body.term { span { white-space: pre; cursor: pointer; - &:hover { - outline: 1px solid rgba(#ffffff, 0.4); - @include media($phone) { - outline: 0 none; - } - } + + display: inline-block; + line-height: 1.15em; // this adjusts the spacing + width: 0.6em; // horizontal spacing, estimated to be about right + overflow: visible; } } diff --git a/user/screen.c b/user/screen.c index 5b39d26..5c29a53 100644 --- a/user/screen.c +++ b/user/screen.c @@ -1146,14 +1146,14 @@ static const u16 codepage_1[] = 0x2663, // 37 % ♣ (5) 0x2660, // 38 & ♠ (6) 0x2022, // 39 ' • (7) - inverse dot and circle left out, can be done with SGR - 0x231B, // 40 ( ⌛ - hourglass (timer icon) + 0x0,//0x231B, // 40 ( ⌛ - hourglass (timer icon) 0x25CB, // 41 ) ○ (9) 0x21AF, // 42 * ↯ - electricity (lightning monitor...) 0x266A, // 43 + ♪ (13) 0x266B, // 44 , ♫ (14) 0x263C, // 45 - ☼ (15) 0x2302, // 46 . ⌂ (127) - 0x2622, // 47 / ☢ - radioactivity (geiger counter...) + 0x0,//0x2622, // 47 / ☢ - radioactivity (geiger counter...) 0x2591, // 48 0 ░ (176) - this block is kept aligned and ordered from DOS, moved -128 0x2592, // 49 1 ▒ (177) 0x2593, // 50 2 ▓ (178) @@ -1212,10 +1212,10 @@ static const u16 codepage_1[] = 0x25BC, // 103 g ▼ (31) 0x25BA, // 104 h ► (16) 0x25C4, // 105 i ◄ (17) - 0x25E2, // 106 j ◢ - added for slanted corners - 0x25E3, // 107 k ◣ - 0x25E4, // 108 l ◤ - 0x25E5, // 109 m ◥ + 0x0,//0x25E2, // 106 j ◢ - added for slanted corners + 0x0,//0x25E3, // 107 k ◣ + 0x0,//0x25E4, // 108 l ◤ + 0x0,//0x25E5, // 109 m ◥ 0x256D, // 110 n ╭ - rounded corners 0x256E, // 111 o ╮ 0x256F, // 112 p ╯ @@ -1231,8 +1231,8 @@ static const u16 codepage_1[] = 0x0, // 122 z 0x0, // 123 { 0x0, // 124 | - 0x2714, // 125 } ✔ - checkboxes or checklist items - 0x2718, // 126 ~ ✘ + 0x0,//0x2714, // 125 } ✔ - checkboxes or checklist items + 0x0,//0x2718, // 126 ~ ✘ }; /** diff --git a/user/version.h b/user/version.h index 156d3a8..fb7aa91 100644 --- a/user/version.h +++ b/user/version.h @@ -6,8 +6,8 @@ #define ESP_VT100_FIRMWARE_VERSION_H #define FW_V_MAJOR 0 -#define FW_V_MINOR 6 -#define FW_V_PATCH 10 +#define FW_V_MINOR 7 +#define FW_V_PATCH 0 #define FIRMWARE_VERSION STR(FW_V_MAJOR) "." STR(FW_V_MINOR) "." STR(FW_V_PATCH) "+" GIT_HASH #define FIRMWARE_VERSION_NUM (FW_V_MAJOR*10000 + FW_V_MINOR*100 + FW_V_PATCH) // this is used in ID queries