Temporarily fixed #71 by fixed cell width, rel 7.0 preparations

pull/111/merge 0.7.0
Ondřej Hruška 7 years ago
parent 4edaa0687d
commit fe699c7918
  1. 13
      html_orig/css/app.css
  2. 13
      html_orig/sass/pages/_term.scss
  3. 16
      user/screen.c
  4. 4
      user/version.h

@ -1152,7 +1152,7 @@ body.term #screen {
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
font-family: monospace; font-family: monospace;
font-size: 16pt; font-size: 20px;
white-space: nowrap; white-space: nowrap;
background: #111213; background: #111213;
padding: 6px; padding: 6px;
@ -1160,12 +1160,11 @@ body.term #screen {
border: 2px solid #3983CD; } border: 2px solid #3983CD; }
body.term #screen span { body.term #screen span {
white-space: pre; white-space: pre;
cursor: pointer; } cursor: pointer;
body.term #screen span:hover { display: inline-block;
outline: 1px solid rgba(255, 255, 255, 0.4); } line-height: 1.15em;
@media screen and (max-width: 544px) { width: 0.6em;
body.term #screen span:hover { overflow: visible; }
outline: 0 none; } }
body.term #buttons { body.term #buttons {
margin-top: 10px; margin-top: 10px;
white-space: nowrap; } white-space: nowrap; }

@ -17,7 +17,7 @@ body.term {
#screen { #screen {
@include noselect(); @include noselect();
font-family: monospace; font-family: monospace;
font-size: 16pt; font-size: 20px;//16pt; - 16pt causes vertical breaks in line drawing characters??
white-space: nowrap; white-space: nowrap;
background: #111213; background: #111213;
padding: 6px; padding: 6px;
@ -27,12 +27,11 @@ body.term {
span { span {
white-space: pre; white-space: pre;
cursor: pointer; cursor: pointer;
&:hover {
outline: 1px solid rgba(#ffffff, 0.4); display: inline-block;
@include media($phone) { line-height: 1.15em; // this adjusts the spacing
outline: 0 none; width: 0.6em; // horizontal spacing, estimated to be about right
} overflow: visible;
}
} }
} }

@ -1146,14 +1146,14 @@ static const u16 codepage_1[] =
0x2663, // 37 % ♣ (5) 0x2663, // 37 % ♣ (5)
0x2660, // 38 & ♠ (6) 0x2660, // 38 & ♠ (6)
0x2022, // 39 ' • (7) - inverse dot and circle left out, can be done with SGR 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) 0x25CB, // 41 ) ○ (9)
0x21AF, // 42 * ↯ - electricity (lightning monitor...) 0x21AF, // 42 * ↯ - electricity (lightning monitor...)
0x266A, // 43 + ♪ (13) 0x266A, // 43 + ♪ (13)
0x266B, // 44 , ♫ (14) 0x266B, // 44 , ♫ (14)
0x263C, // 45 - ☼ (15) 0x263C, // 45 - ☼ (15)
0x2302, // 46 . ⌂ (127) 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 0x2591, // 48 0 ░ (176) - this block is kept aligned and ordered from DOS, moved -128
0x2592, // 49 1 ▒ (177) 0x2592, // 49 1 ▒ (177)
0x2593, // 50 2 ▓ (178) 0x2593, // 50 2 ▓ (178)
@ -1212,10 +1212,10 @@ static const u16 codepage_1[] =
0x25BC, // 103 g ▼ (31) 0x25BC, // 103 g ▼ (31)
0x25BA, // 104 h ► (16) 0x25BA, // 104 h ► (16)
0x25C4, // 105 i ◄ (17) 0x25C4, // 105 i ◄ (17)
0x25E2, // 106 j ◢ - added for slanted corners 0x0,//0x25E2, // 106 j ◢ - added for slanted corners
0x25E3, // 107 k ◣ 0x0,//0x25E3, // 107 k ◣
0x25E4, // 108 l ◤ 0x0,//0x25E4, // 108 l ◤
0x25E5, // 109 m ◥ 0x0,//0x25E5, // 109 m ◥
0x256D, // 110 n ╭ - rounded corners 0x256D, // 110 n ╭ - rounded corners
0x256E, // 111 o ╮ 0x256E, // 111 o ╮
0x256F, // 112 p ╯ 0x256F, // 112 p ╯
@ -1231,8 +1231,8 @@ static const u16 codepage_1[] =
0x0, // 122 z 0x0, // 122 z
0x0, // 123 { 0x0, // 123 {
0x0, // 124 | 0x0, // 124 |
0x2714, // 125 } ✔ - checkboxes or checklist items 0x0,//0x2714, // 125 } ✔ - checkboxes or checklist items
0x2718, // 126 ~ ✘ 0x0,//0x2718, // 126 ~ ✘
}; };
/** /**

@ -6,8 +6,8 @@
#define ESP_VT100_FIRMWARE_VERSION_H #define ESP_VT100_FIRMWARE_VERSION_H
#define FW_V_MAJOR 0 #define FW_V_MAJOR 0
#define FW_V_MINOR 6 #define FW_V_MINOR 7
#define FW_V_PATCH 10 #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 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 #define FIRMWARE_VERSION_NUM (FW_V_MAJOR*10000 + FW_V_MINOR*100 + FW_V_PATCH) // this is used in ID queries

Loading…
Cancel
Save