Skip to content

Commit f95d28d

Browse files
authored
use Angular Material overrides API (#6982)
Add `--mat-` prefixed variables alongside `--mdc-` variables because Angular Material will be renaming these tokens internally. This rename will occur in v20, which is used internally. The `--mdc-` tokens will continue to be defined since this still depends on an older version of Angular Material externally. Includes necessary update to `tensorboard/pip_package/setup.cfg`, using underscore instead of dash-case for `description_file` ``` python3.11/site-packages/setuptools/dist.py:452: SetuptoolsDeprecationWarning: Invalid dash-separated options ******************************************************************************** Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead. This deprecation is overdue, please update your project and remove deprecated calls to avoid build errors in the future. See https://setuptools.pypa.io/en/latest/userguide/declarative_config.html for details. ******************************************************************************** ```
1 parent 61f3d63 commit f95d28d

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

tensorboard/pip_package/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[metadata]
2-
description-file = README.rst
2+
description_file = README.rst
33
license_files = LICENSE

tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_component.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,11 @@ limitations under the License.
6666
position: absolute;
6767
right: 40px;
6868
--mdc-slider-handle-width: 80px;
69+
--mat-slider-handle-width: 80px;
6970
--mdc-slider-handle-height: 16px;
71+
--mat-slider-handle-height: 16px;
7072
--mdc-slider-handle-shape: 5px;
73+
--mat-slider-handle-shape: 5px;
7174
}
7275

7376
::ng-deep .mat-mdc-focus-indicator {

tensorboard/webapp/theme/_tb_theme.template.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,13 @@ $tb-dark-theme: map_merge(
303303
body.dark-mode {
304304
mat-slider {
305305
--mdc-slider-handle-width: 12px;
306+
--mat-slider-handle-width: 12px;
306307
--mdc-slider-handle-height: 12px;
308+
--mat-slider-handle-height: 12px;
307309
--mdc-slider-active-track-height: 2px;
310+
--mat-slider-active-track-height: 2px;
308311
--mdc-slider-inactive-track-height: 2px;
312+
--mat-slider-inactive-track-height: 2px;
309313
}
310314

311315
a,
@@ -315,9 +319,13 @@ $tb-dark-theme: map_merge(
315319
--tb-icon-button-width: 40px;
316320
--tb-icon-button-height: 40px;
317321
--mdc-text-button-label-text-tracking: normal;
322+
--mat-text-button-label-text-tracking: normal;
318323
--mdc-filled-button-label-text-tracking: normal;
324+
--mat-filled-button-label-text-tracking: normal;
319325
--mdc-outlined-button-label-text-tracking: normal;
326+
--mat-outlined-button-label-text-tracking: normal;
320327
--mdc-protected-button-label-text-tracking: normal;
328+
--mat-protected-button-label-text-tracking: normal;
321329

322330
&[mat-icon-button].mat-mdc-icon-button {
323331
width: var(--tb-icon-button-width);

0 commit comments

Comments
 (0)