Remove Roboto font

texodus · texodus · commit 738a465e0a54 · 2023-11-24T18:32:59.000-05:00
diff --git a/docs/src/components/Demo/styles.module.css b/docs/src/components/Demo/styles.module.css
@@ -55,7 +55,8 @@
 .timecontrols span {
     text-align: end;
     width: 80px;
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     opacity: 0.5;
     font-size: 12px;
 }
diff --git a/docs/src/css/regular_table_reset.css b/docs/src/css/regular_table_reset.css
@@ -18,7 +18,8 @@ tbody,
 table thead {
     border: 0;
     font-size: 12px;
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     margin: 0;
     padding: 0;
     vertical-align: middle;
diff --git a/examples/blocks/src/fractal/index.css b/examples/blocks/src/fractal/index.css
@@ -80,7 +80,8 @@ perspective-viewer[theme="Pro Dark"] {
 span,
 input,
 button {
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     font-size: 12px;
     background: none;
     margin: 0px;
@@ -103,7 +104,8 @@ input {
 }
 
 input[type="number"] {
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
 }
 
 input:focus {
diff --git a/examples/blocks/src/market/index.css b/examples/blocks/src/market/index.css
@@ -14,7 +14,8 @@
 body {
     background: #242526;
     color: white;
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     touch-action: none;
 }
 
@@ -63,8 +64,10 @@ img {
     margin-left: 14px;
 }
 
-select, button {
-    font-family: "Roboto Mono";
+select,
+button {
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     font-size: 12px;
     appearance: none;
     background-color: transparent;
@@ -78,12 +81,13 @@ select, button {
     outline: none;
     user-select: none;
     height: 32px;
-    margin-top:  8px;
+    margin-top: 8px;
     margin-bottom: 8px;
 }
 
-select:hover, button:hover {
+select:hover,
+button:hover {
     color: #242526;
     background-color: #f4f5f6;
     border-color: #f4f5f6;
-}
+}
diff --git a/examples/blocks/src/webcam/index.css b/examples/blocks/src/webcam/index.css
@@ -14,7 +14,8 @@
 body {
     background: #242526;
     color: white;
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     touch-action: none;
 }
 
@@ -63,8 +64,10 @@ img {
     margin-left: 14px;
 }
 
-select, button {
-    font-family: "Roboto Mono";
+select,
+button {
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     font-size: 12px;
     appearance: none;
     background-color: transparent;
@@ -78,12 +81,13 @@ select, button {
     outline: none;
     user-select: none;
     height: 32px;
-    margin-top:  8px;
+    margin-top: 8px;
     margin-bottom: 8px;
 }
 
-select:hover, button:hover {
+select:hover,
+button:hover {
     color: #242526;
     background-color: #f4f5f6;
     border-color: #f4f5f6;
-}
+}
diff --git a/packages/perspective-workspace/build.js b/packages/perspective-workspace/build.js
@@ -110,11 +110,6 @@ async function build_all() {
     );
 
     const builder = new BuildCss("./src/themes");
-    add(
-        builder,
-        "fonts.less",
-        "@finos/perspective-viewer/src/themes/fonts.less"
-    );
     add(
         builder,
         "icons.less",
@@ -125,11 +120,6 @@ async function build_all() {
     fs.writeFileSync("dist/css/pro.css", builder.compile().get("output.css"));
 
     const builder2 = new BuildCss("./src/themes");
-    add(
-        builder2,
-        "fonts.less",
-        "@finos/perspective-viewer/src/themes/fonts.less"
-    );
     add(
         builder2,
         "icons.less",
diff --git a/packages/perspective-workspace/src/less/menu.less b/packages/perspective-workspace/src/less/menu.less
@@ -108,12 +108,14 @@
 
 .p-Menu-itemIcon:before {
     content: attr(content);
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
 }
 
 [data-type="submenu"] .lm-Menu-itemSubmenuIcon:before {
     content: ">";
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",
+        "Consolas", "Liberation Mono", monospace;
     height: 18px;
 }
 
diff --git a/packages/perspective-workspace/src/themes/pro-dark.less b/packages/perspective-workspace/src/themes/pro-dark.less
@@ -63,12 +63,12 @@ perspective-viewer[theme="Pro Dark"].workspace-master-widget {
 }
 
 .p-Menu {
-    // font-family: "Roboto Mono";
+    // font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;
     // font-weight: 300 !important;
     background: @grey700  !important;
     color: white !important;
     border: 1px solid @grey500  !important;
  
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;
     font-weight: 300;
 }
diff --git a/packages/perspective-workspace/src/themes/pro.less b/packages/perspective-workspace/src/themes/pro.less
@@ -56,7 +56,7 @@ perspective-viewer[theme="Pro Light"].workspace-master-widget {
 }
 
 @mixin perspective-workspace-pro-base {
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;
     --open-settings-button--content: "expand_more";
     --close-settings-button--content: "expand_less";
     --close-button--content: "\2715";
@@ -84,7 +84,7 @@ perspective-viewer[theme="Pro Light"].workspace-master-widget {
 }
 
 .p-Menu {
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;
     font-weight: 300;
     color: #161616;
 }
diff --git a/rust/perspective-viewer/build.rs b/rust/perspective-viewer/build.rs
@@ -57,7 +57,6 @@ fn main() -> Result<(), anyhow::Error> {
     let mut build = BuildCss::new("./src/themes");
     if !cfg!(feature = "define_custom_elements_async") {
         build.add_file("variables.less");
-        build.add_file("fonts.less");
         build.add_file("icons.less");
         build.add_file("pro.less");
         build.add_file("pro-dark.less");
diff --git a/rust/perspective-viewer/src/less/column-settings-panel.less b/rust/perspective-viewer/src/less/column-settings-panel.less
@@ -11,11 +11,13 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 @import (reference) url(./column-selector.less);
+
 :host {
     #column_settings_sidebar {
         overflow: hidden;
         text-overflow: ellipsis;
     }
+
     #column_settings_icon:before {
         @include icon;
         height: 14px;
@@ -42,9 +44,10 @@
             border: none;
             border-radius: 2px;
             margin-bottom: 0.5em;
-            font-family: "Roboto Mono", monospace;
+            font-family: inherit;
             font-size: 12px;
             min-height: 24px;
+
             &:disabled {
                 background-color: var(--inactive--color);
             }
diff --git a/rust/perspective-viewer/src/less/column-style.less b/rust/perspective-viewer/src/less/column-style.less
@@ -38,6 +38,7 @@
             padding: 0 8px;
             border-radius: 2px;
             border: 1px solid transparent;
+
             &:hover {
                 border-color: var(--inactive--color, #666);
             }
@@ -174,7 +175,7 @@
         }
 
         .operator {
-            font-family: "Roboto Mono", monospace;
+            font-family: inherit;
             white-space: pre;
         }
 
diff --git a/rust/perspective-viewer/src/less/containers/dropdown-menu.less b/rust/perspective-viewer/src/less/containers/dropdown-menu.less
@@ -27,7 +27,7 @@
 
     code {
         font-size: 12px;
-        font-family: var(--interface-monospace--font-family, "Roboto Mono"),
+        font-family: var(--interface-monospace--font-family),
             monospace;
     }
 
@@ -38,7 +38,7 @@
         border: none;
         border-bottom: 1px solid var(--inactive--color, #ccc);
         background: transparent;
-        font-family: var(--interface-monospace--font-family, "Roboto Mono"),
+        font-family: var(--interface-monospace--font-family),
             monospace;
         font-size: 12px;
         color: inherit;
@@ -90,4 +90,4 @@
     .dropdown-group-container span:hover {
         background-color: rgba(0, 0, 0, 0.05);
     }
-}
+}
diff --git a/rust/perspective-viewer/src/themes/dracula.less b/rust/perspective-viewer/src/themes/dracula.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro-dark.less");
diff --git a/rust/perspective-viewer/src/themes/fonts.less b/rust/perspective-viewer/src/themes/fonts.less
diff --git a/rust/perspective-viewer/src/themes/gruvbox-dark.less b/rust/perspective-viewer/src/themes/gruvbox-dark.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro-dark.less");
diff --git a/rust/perspective-viewer/src/themes/gruvbox.less b/rust/perspective-viewer/src/themes/gruvbox.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro.less");
diff --git a/rust/perspective-viewer/src/themes/monokai.less b/rust/perspective-viewer/src/themes/monokai.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro-dark.less");
diff --git a/rust/perspective-viewer/src/themes/pro-dark.less b/rust/perspective-viewer/src/themes/pro-dark.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro.less");
diff --git a/rust/perspective-viewer/src/themes/pro.less b/rust/perspective-viewer/src/themes/pro.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 // Register theme for auto-detection
@@ -45,7 +44,7 @@ perspective-string-column-style[theme="Pro Light"] {
 
 
 @mixin perspective-modal-pro {
-    font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;
     background-color: white;
     border: 1px solid var(--inactive--color);
     border-radius: 0 0 2px 2px;
@@ -99,9 +98,8 @@ perspective-string-column-style[theme="Pro Light"] {
 }
 
 @mixin perspective-viewer-pro--fonts {
-    font-family: "Roboto Mono";
-    --preload-fonts: "Roboto Mono:400";
-    --interface-monospace--font-family: "Roboto Mono";
+    font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;
+    --interface-monospace--font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;
 }
 
 @mixin perspective-viewer-pro--d3fc {
diff --git a/rust/perspective-viewer/src/themes/solarized-dark.less b/rust/perspective-viewer/src/themes/solarized-dark.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro-dark.less");
diff --git a/rust/perspective-viewer/src/themes/solarized.less b/rust/perspective-viewer/src/themes/solarized.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro.less");
diff --git a/rust/perspective-viewer/src/themes/vaporwave.less b/rust/perspective-viewer/src/themes/vaporwave.less
@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-@import "fonts.less";
 @import "icons.less";
 
 @import url("ref://pro-dark.less");
diff --git a/rust/perspective-viewer/test/css/demo.css b/rust/perspective-viewer/test/css/demo.css
@@ -17,4 +17,6 @@ perspective-viewer {
     left: 0;
     right: 0;
     bottom: 0;
+    font-family: "Roboto Mono" !important;
+    --preload-fonts: "Roboto Mono:400";
 }
diff --git a/rust/perspective-viewer/test/html/plugin-priority-order.html b/rust/perspective-viewer/test/html/plugin-priority-order.html
@@ -43,7 +43,6 @@
         <script type="module" src="/load-viewer-csv.js"></script>
         <link rel="stylesheet" href="../css/demo.css" />
         <link rel="stylesheet" href="/@finos/perspective-viewer/dist/css/pro.css" />
-        <link rel="stylesheet" href="/@fontsource/roboto-mono/400.css" />
     </head>
     <body>
         <perspective-viewer></perspective-viewer>
diff --git a/tools/perspective-test/src/html/basic-test.html b/tools/perspective-test/src/html/basic-test.html
diff --git a/tools/perspective-test/src/html/superstore-test.html b/tools/perspective-test/src/html/superstore-test.html
diff --git a/tools/perspective-test/src/html/themed-test.html b/tools/perspective-test/src/html/themed-test.html
diff --git a/tools/perspective-test/src/html/workspace-test.html b/tools/perspective-test/src/html/workspace-test.html

Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,14 @@`
`108`	`108`
`109`	`109`	`.p-Menu-itemIcon:before {`
`110`	`110`	`content: attr(content);`
`111`		`- font-family: "Roboto Mono";`
	`111`	`+ font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",`
	`112`	`+ "Consolas", "Liberation Mono", monospace;`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`[data-type="submenu"] .lm-Menu-itemSubmenuIcon:before {`
`115`	`116`	`content: ">";`
`116`		`- font-family: "Roboto Mono";`
	`117`	`+ font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo",`
	`118`	`+ "Consolas", "Liberation Mono", monospace;`
`117`	`119`	`height: 18px;`
`118`	`120`	`}`
`119`	`121`
Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,12 @@ perspective-viewer[theme="Pro Dark"].workspace-master-widget {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`.p-Menu {`
`66`		`- // font-family: "Roboto Mono";`
	`66`	`+ // font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;`
`67`	`67`	`// font-weight: 300 !important;`
`68`	`68`	`background: @grey700 !important;`
`69`	`69`	`color: white !important;`
`70`	`70`	`border: 1px solid @grey500 !important;`
`71`	`71`
`72`		`- font-family: "Roboto Mono";`
	`72`	`+ font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;`
`73`	`73`	`font-weight: 300;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ perspective-viewer[theme="Pro Light"].workspace-master-widget {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@mixin perspective-workspace-pro-base {`
`59`		`- font-family: "Roboto Mono";`
	`59`	`+ font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;`
`60`	`60`	`--open-settings-button--content: "expand_more";`
`61`	`61`	`--close-settings-button--content: "expand_less";`
`62`	`62`	`--close-button--content: "\2715";`
`@@ -84,7 +84,7 @@ perspective-viewer[theme="Pro Light"].workspace-master-widget {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`.p-Menu {`
`87`		`- font-family: "Roboto Mono";`
	`87`	`+ font-family: "ui-monospace", "SFMono-Regular", "SF Mono", "Menlo", "Consolas", "Liberation Mono", monospace;`
`88`	`88`	`font-weight: 300;`
`89`	`89`	`color: #161616;`
`90`	`90`	`}`