Skip to content

Commit ccf9c2c

Browse files
authored
Merge pull request #2451 from finos/fix-console-errors
Better CSS build
2 parents 3401e63 + 738a465 commit ccf9c2c

45 files changed

Lines changed: 275 additions & 213 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cpp/perspective/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ if(PSP_WASM_BUILD)
239239
-g0 \
240240
-flto \
241241
")
242-
243-
# TODO: -flto
244242
endif()
245243

246244
set(ASYNC_MODE_FLAGS "")

cpp/perspective/build.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ try {
4242

4343
execSync(`cpy web/**/* ../web`, { cwd, stdio });
4444
execSync(`cpy node/**/* ../node`, { cwd, stdio });
45-
if (!process.env.PSP_DEBUG) {
46-
bootstrap(`../../cpp/perspective/dist/web/perspective.cpp.wasm`);
47-
bootstrap(`../../cpp/perspective/dist/node/perspective.cpp.wasm`);
48-
}
45+
bootstrap(`../../cpp/perspective/dist/web/perspective.cpp.wasm`);
46+
bootstrap(`../../cpp/perspective/dist/node/perspective.cpp.wasm`);
4947
} catch (e) {
5048
console.error(e);
5149
process.exit(1);

docs/src/components/Demo/styles.module.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
.timecontrols span {
5656
text-align: end;
5757
width: 80px;
58-
font-family: "Roboto Mono";
58+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
59+
"Consolas", "Liberation Mono", monospace;
5960
opacity: 0.5;
6061
font-size: 12px;
6162
}

docs/src/css/regular_table_reset.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ tbody,
1818
table thead {
1919
border: 0;
2020
font-size: 12px;
21-
font-family: "Roboto Mono";
21+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
22+
"Consolas", "Liberation Mono", monospace;
2223
margin: 0;
2324
padding: 0;
2425
vertical-align: middle;

examples/blocks/index.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ const replacements = {
2828
"perspective-viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js": `perspective-viewer-datagrid@${version}/dist/cdn/perspective-viewer-datagrid.js`,
2929
"perspective-viewer-d3fc/dist/cdn/perspective-viewer-d3fc.js": `perspective-viewer-d3fc@${version}/dist/cdn/perspective-viewer-d3fc.js`,
3030
"perspective-workspace/dist/cdn/perspective-workspace.js": `perspective-workspace@${version}/dist/cdn/perspective-workspace.js`,
31+
"perspective/dist/cdn/perspective.cpp.wasm": `perspective@${version}/dist/cdn/perspective.cpp.wasm`,
32+
"perspective-viewer/dist/cdn/perspective_bg.wasm": `perspective-viewer@${version}/dist/cdn/perspective_bg.wasm`,
33+
"perspective/dist/cdn/perspective.worker.js": `perspective@${version}/dist/cdn/perspective.worker.js`,
3134
};
3235

3336
export async function dist_examples(

examples/blocks/src/fractal/index.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ perspective-viewer[theme="Pro Dark"] {
8080
span,
8181
input,
8282
button {
83-
font-family: "Roboto Mono";
83+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
84+
"Consolas", "Liberation Mono", monospace;
8485
font-size: 12px;
8586
background: none;
8687
margin: 0px;
@@ -103,7 +104,8 @@ input {
103104
}
104105

105106
input[type="number"] {
106-
font-family: "Roboto Mono";
107+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
108+
"Consolas", "Liberation Mono", monospace;
107109
}
108110

109111
input:focus {

examples/blocks/src/market/index.css

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
body {
1515
background: #242526;
1616
color: white;
17-
font-family: "Roboto Mono";
17+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
18+
"Consolas", "Liberation Mono", monospace;
1819
touch-action: none;
1920
}
2021

@@ -63,8 +64,10 @@ img {
6364
margin-left: 14px;
6465
}
6566

66-
select, button {
67-
font-family: "Roboto Mono";
67+
select,
68+
button {
69+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
70+
"Consolas", "Liberation Mono", monospace;
6871
font-size: 12px;
6972
appearance: none;
7073
background-color: transparent;
@@ -78,12 +81,13 @@ select, button {
7881
outline: none;
7982
user-select: none;
8083
height: 32px;
81-
margin-top: 8px;
84+
margin-top: 8px;
8285
margin-bottom: 8px;
8386
}
8487

85-
select:hover, button:hover {
88+
select:hover,
89+
button:hover {
8690
color: #242526;
8791
background-color: #f4f5f6;
8892
border-color: #f4f5f6;
89-
}
93+
}

examples/blocks/src/webcam/index.css

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
body {
1515
background: #242526;
1616
color: white;
17-
font-family: "Roboto Mono";
17+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
18+
"Consolas", "Liberation Mono", monospace;
1819
touch-action: none;
1920
}
2021

@@ -63,8 +64,10 @@ img {
6364
margin-left: 14px;
6465
}
6566

66-
select, button {
67-
font-family: "Roboto Mono";
67+
select,
68+
button {
69+
font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
70+
"Consolas", "Liberation Mono", monospace;
6871
font-size: 12px;
6972
appearance: none;
7073
background-color: transparent;
@@ -78,12 +81,13 @@ select, button {
7881
outline: none;
7982
user-select: none;
8083
height: 32px;
81-
margin-top: 8px;
84+
margin-top: 8px;
8285
margin-bottom: 8px;
8386
}
8487

85-
select:hover, button:hover {
88+
select:hover,
89+
button:hover {
8690
color: #242526;
8791
background-color: #f4f5f6;
8892
border-color: #f4f5f6;
89-
}
93+
}

packages/perspective-jupyterlab/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@finos/perspective-esbuild-plugin": "^2.7.0",
4949
"@finos/perspective-test": "^2.7.0",
5050
"@jupyterlab/builder": "^3.4.0",
51-
"@prospective.co/procss": "^0.1.13",
51+
"@prospective.co/procss": "^0.1.14",
5252
"cpy": "^9.0.1"
5353
},
5454
"jupyterlab": {

packages/perspective-viewer-d3fc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"devDependencies": {
5757
"@finos/perspective-esbuild-plugin": "^2.7.0",
5858
"@finos/perspective-test": "^2.7.0",
59-
"@prospective.co/procss": "^0.1.13"
59+
"@prospective.co/procss": "^0.1.14"
6060
}
6161
}

0 commit comments

Comments
 (0)