diff --git a/packages/iris-grid/src/FilterInputField.scss b/packages/iris-grid/src/FilterInputField.scss index 828eba5bf6..d1a205163c 100644 --- a/packages/iris-grid/src/FilterInputField.scss +++ b/packages/iris-grid/src/FilterInputField.scss @@ -1,3 +1,4 @@ +@use './IrisGrid.scss'; @import '@deephaven/components/scss/custom.scss'; .iris-grid-input-autosized-wrapper { @@ -21,12 +22,18 @@ width: auto; height: 100%; border: $input-border-width solid; - padding: 6px 2px 3px 3px; + padding: 3px 2px 3px 3px; margin-right: 24px; // leave space for filter-button overflow: hidden; visibility: hidden; white-space: nowrap; grid-area: 1 / 1; + font: IrisGrid.$iris-grid-font; + font-feature-settings: IrisGrid.$iris-grid-font-feature-settings; + + @-moz-document url-prefix('') { + font-feature-settings: normal; + } } .iris-grid-input-field { @@ -38,6 +45,15 @@ height: 100%; padding: 3px 2px 3px 3px; border-radius: 1px; + font: IrisGrid.$iris-grid-font; + font-feature-settings: IrisGrid.$iris-grid-font-feature-settings; + + @-moz-document url-prefix('') { + // Firefox doesn't support font-feature-settings on canvas + // so we shouldn't use it here either + // https://bugzilla.mozilla.org/show_bug.cgi?id=1580953 + font-feature-settings: normal; + } &.iris-grid-has-filter { // same as filter-bar-expanded-active-bg diff --git a/packages/iris-grid/src/IrisGrid.scss b/packages/iris-grid/src/IrisGrid.scss index 652f3bbd43..629504b418 100644 --- a/packages/iris-grid/src/IrisGrid.scss +++ b/packages/iris-grid/src/IrisGrid.scss @@ -5,6 +5,7 @@ $iris-grid-bg: $content-bg; $iris-grid-font: 12px fira sans, sans-serif; +$iris-grid-font-feature-settings: 'tnum'; $table-sidebar-max-width: 320px; $table-sidebar-bg: $gray-700; $iris-grid-bar-bg: $primary-dark; @@ -86,7 +87,7 @@ $cell-invalid-box-shadow: min-height: 0; position: relative; font: $iris-grid-font; - font-feature-settings: 'tnum'; + font-feature-settings: $iris-grid-font-feature-settings; transition: all $transition-mid; .grid-settings-button { diff --git a/tests/table.spec.ts-snapshots/tests-simple-table-operations-quick-filters-with-the-advanced-filters-in-above-test-applied-1-webkit-linux.png b/tests/table.spec.ts-snapshots/tests-simple-table-operations-quick-filters-with-the-advanced-filters-in-above-test-applied-1-webkit-linux.png index 5df54fe56c..270787211e 100644 Binary files a/tests/table.spec.ts-snapshots/tests-simple-table-operations-quick-filters-with-the-advanced-filters-in-above-test-applied-1-webkit-linux.png and b/tests/table.spec.ts-snapshots/tests-simple-table-operations-quick-filters-with-the-advanced-filters-in-above-test-applied-1-webkit-linux.png differ