Skip to content

Commit 1c5525f

Browse files
thinkyheadthinkyhead
committed
🚸 [2.1.76] Fix Info appearance
1 parent 9bc7dae commit 1c5525f

File tree

4 files changed

+61
-46
lines changed

4 files changed

+61
-46
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
The following enhancements and changes have been made to ***Auto Build Marlin***.
44

5+
## 2.1.76
6+
- Info Panel: Clean up appearance
7+
58
## 2.1.75
69
- Info Panel: Search marlinfw.org site for documentation.
710
- Config Editor: Add parsing for Marlin `2.1.3-b3` macros.

‎abm/css/infoview.css‎

Lines changed: 53 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,67 +6,70 @@
66

77
* {
88
--marlin-svg: url(marlin-b.svg);
9-
--abm-info-color: var(--vscode-editor-color);
10-
--abm-info-overlay-bg: var(--vscode-sideBarSectionHeader-background);
119
--abm-item-label-width: 24em;
1210
--abm-field-max-width: calc(100% - var(--abm-item-label-width) - 2em);
11+
--color-h2-gcode: #B88C;
12+
--color-h2-basics: #8B8C;
13+
--color-h2-feat: #8BBC;
14+
--color-h2-hardware: #88BC;
15+
--color-h2-devel: #BB8C;
16+
--color-h2-setting: #B8BC;
17+
--color-h2-page: #999C;
1318
}
1419

1520
body.vscode-light {
21+
--abm-info-overlay-bg: white;
1622
--abm-svg-color: #00000020;
1723
--abm-info-bg: #F5F5FDC0;
1824
--abm-info-bc: #CCCCCCC0;
1925
--abm-line-hover-bg: #FFFFFFE0;
20-
--abm-info-color: #000;
26+
--abm-info-color: black;
2127
--abm-info-color-comment: #3C2200;
22-
--abm-info-legend-color: #000;
28+
--abm-info-legend-color: black;
2329
--abm-info-legend-bg: #FFFA;
24-
--color-h1-gcode: #B88;
25-
--color-h1-basics: #8B8;
26-
--color-h1-feat: #8BB;
27-
--color-h1-hardware: #88B;
28-
--color-h1-devel: #BB8;
29-
--color-h1-setting: #B8B;
30+
--abm-item-row-bg: #FFF4;
31+
--abm-item-row-odd-bg: #FFFA;
32+
--abm-item-border-color: #000A;
3033
}
3134

3235
body.vscode-dark {
36+
--abm-info-overlay-bg: #333;
3337
--marlin-svg: url(marlin-w.svg);
3438
--abm-svg-color: #FFFFFF20;
3539
--abm-line-hover-bg: #00000020;
3640
--abm-info-bg: #00002220;
3741
--abm-info-bc: #FFFFFF40;
38-
--abm-info-color: #FFF;
42+
--abm-info-color: white;
3943
--abm-info-color-comment: #827461;
40-
--abm-info-legend-color: #FFF;
44+
--abm-info-legend-color: white;
4145
--abm-info-legend-bg: #0008;
42-
--color-h1-gcode: #B88;
43-
--color-h1-basics: #8B8;
44-
--color-h1-feat: #8BB;
45-
--color-h1-hardware: #88B;
46-
--color-h1-devel: #BB8;
47-
--color-h1-setting: #B8B;
46+
--abm-item-row-bg: #0000;
47+
--abm-item-row-odd-bg: #FFF2;
48+
--abm-item-border-color: #FFFA;
4849
}
4950

5051
body.vscode-high-contrast {
52+
--abm-info-overlay-bg: #2A2;
5153
--marlin-svg: url(marlin-w.svg);
5254
--abm-svg-color: #FFFFFF20;
5355
--abm-line-hover-bg: #00000030;
5456
--abm-info-bg: #282C34AA;
5557
--abm-info-bc: #CCCCCCC0;
56-
--abm-info-color: #FFF;
58+
--abm-info-color: white;
5759
--abm-info-color-comment: #827461;
58-
--abm-info-legend-color: #FF0;
60+
--abm-info-legend-color: yellow;
5961
--abm-info-legend-bg: #009;
60-
--color-h1-gcode: #B88;
61-
--color-h1-basics: #8B8;
62-
--color-h1-feat: #8BB;
63-
--color-h1-hardware: #88B;
64-
--color-h1-devel: #BB8;
65-
--color-h1-setting: #B8B;
62+
--abm-item-row-bg: black;
63+
--abm-item-row-odd-bg: #226;
64+
--abm-item-border-color: white;
6665
}
6766
body.vscode-high-contrast-light {
67+
--abm-info-overlay-bg: #AFA;
6868
--abm-info-legend-color: #009;
6969
--abm-info-legend-bg: #FF0;
70+
--abm-item-row-bg: #FFF;
71+
--abm-item-row-odd-bg: #DDF;
72+
--abm-item-border-color: black;
7073
}
7174

7275
.clear { clear: both !important; }
@@ -101,33 +104,42 @@ pre {
101104

102105
[data-search-form] {
103106
padding-bottom: 4px;
104-
font-size: 150%;
107+
font-size: 120%;
105108
label { font-weight: bold; margin-right: 0.5em; }
106-
input { font-size: 110%; border-radius: 1em; padding: 2px 0.5em; }
109+
input { font-size: 100%; border-radius: 1em; padding: 2px 0.5em; }
107110
text-align: center;
108111
}
109112
[data-search-results] {
110113
h3, h4 { text-align: left; }
111-
h2 { border-radius: 0.5em; width: auto; padding: 4px 0; margin-bottom: 0; }
112-
h2.gcode { background: var(--color-h1-gcode); }
113-
h2.basics { background: var(--color-h1-basics); }
114-
h2.feat { background: var(--color-h1-feat); }
115-
h2.hardware { background: var(--color-h1-hardware); }
116-
h2.devel { background: var(--color-h1-devel); }
117-
h2.setting { background: var(--color-h1-setting); }
118-
h2.config { background: var(--color-h1-setting); }
114+
h2 {
115+
width: auto;
116+
padding: 4px 0;
117+
margin-bottom: 4px;
118+
border-radius: 1em;
119+
color: var(--abm-info-color);
120+
}
121+
h2.gcode {background: var(--color-h2-gcode);}
122+
h2.basics { background: var(--color-h2-basics); }
123+
h2.feat { background: var(--color-h2-feat); }
124+
h2.hardware { background: var(--color-h2-hardware); }
125+
h2.devel { background: var(--color-h2-devel); }
126+
h2.page { background: var(--color-h2-page); }
127+
h2.setting { background: var(--color-h2-setting); }
128+
h2.config { background: var(--color-h2-setting); }
119129
div.item {
120130
clear: both;
121131
padding: 1em;
122-
border-bottom: 1px solid black;
123132
span.label {
124133
float: right;
125134
font-weight: bold;
126135
margin-right: 1em;
127136
}
128137
>a { clear: both; }
129-
background-color: #FFF4;
130-
&.odd { background-color: #FFFA; }
138+
background-color: var(--abm-item-row-bg);
139+
&.odd { background-color: var(--abm-item-row-odd-bg); }
140+
+div.item {
141+
border-top: 1px dotted var(--abm-item-border-color);
142+
}
131143
}
132144
&>h1 {
133145
color: var(--color-data-search);
@@ -139,7 +151,7 @@ p.found { text-align: center; }
139151
div.overlay {
140152
width: 100%;
141153
position: fixed;
142-
background-color: var(--abm-info-overlay-bg);
143-
box-shadow: 0 0 24px -6px #000;
154+
background-color: var(--vscode-sideBarTitle-background);
155+
box-shadow: 0 0 24px -6px black;
144156
h1 { margin: 0 0 4px 0; }
145157
}

‎abm/js/infoview.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ String.prototype.toTitleCase = function () {
1515
}
1616

1717
//
18-
// Declare a jekyllSearch singleton
18+
// Declare a marlinfwSearch singleton
1919
//
20-
var jekyllSearch = (() => {
20+
var marlinfwSearch = (() => {
2121

2222
var q, qmatch,
2323
$searchPage, $searchForm, $searchInput,
@@ -194,7 +194,7 @@ var jekyllSearch = (() => {
194194
$.each(item.requires.split(","), (i,v) => {
195195
extra_tags += '<span class="label label-requires">🔧&nbsp;' + v + '</span>';
196196
});
197-
if (extra_tags) extra_tags += '<span class="clear">&nbsp;</span>'
197+
if (extra_tags) extra_tags += '<br class="clear" />'
198198
html = self.injectContent(html, extra_tags, '##CustomHTML##');
199199
var c = item.class ? item.class : '';
200200
html = self.injectContent(html, 'item ' + (odd ? 'odd ' : '') + c, '##DivClass##');
@@ -232,7 +232,7 @@ $(function () {
232232
// Set up the view anew.
233233
function initInfoView() {
234234
// Fetch the marlinfw.org site index
235-
jekyllSearch.init();
235+
marlinfwSearch.init();
236236
}
237237

238238
// Save the current view state.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "auto-build",
33
"displayName": "Auto Build Marlin",
44
"description": "Provides an interface to configure, build, and upload Marlin Firmware.",
5-
"version": "2.1.75",
5+
"version": "2.1.76",
66
"preview": false,
77
"publisher": "marlinfirmware",
88
"icon": "icon.png",

0 commit comments

Comments
 (0)