From c73423ec8fdb69048e0668b7586a5f4f67125f5e Mon Sep 17 00:00:00 2001 From: Daniel Wurzer Date: Mon, 18 Dec 2023 16:30:01 +0100 Subject: [PATCH] refactor(scrollspy): remove animejs and add roboto font --- sass/components/_tooltip.scss | 6 ++++-- src/scrollspy.ts | 13 +------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sass/components/_tooltip.scss b/sass/components/_tooltip.scss index 25484cd176..3a921deb79 100644 --- a/sass/components/_tooltip.scss +++ b/sass/components/_tooltip.scss @@ -1,13 +1,15 @@ .material-tooltip { - // font-family: var(--md-sys-typescale-body-small-font-family-name); padding: 0 8px; border-radius: 4px; background-color: $tooltip-bg-color; color: $tooltip-font-color; + font-family: var(--md-sys-typescale-body-small-font-family-name); font-size: var(--md-sys-typescale-body-small-font-size); - line-height: vat(--md-sys-typescale-body-small-line-height); + line-height: var(--md-sys-typescale-body-small-line-height); + font-weight: var(--md-sys-typescale-body-small-font-weight); + min-height: 24px; opacity: 0; text-align: center; diff --git a/src/scrollspy.ts b/src/scrollspy.ts index 6f8d1d55dc..143420310b 100644 --- a/src/scrollspy.ts +++ b/src/scrollspy.ts @@ -1,5 +1,3 @@ -import anim from "animejs"; - import { Utils } from "./utils"; import { Component, BaseOptions, InitElements, MElement } from "./component"; @@ -123,19 +121,10 @@ export class ScrollSpy extends Component { const trigger = e.target; for (let i = ScrollSpy._elements.length - 1; i >= 0; i--) { const scrollspy = ScrollSpy._elements[i]; - const x = document.querySelector('a[href="#'+scrollspy.el.id+'"]'); if (trigger === x) { e.preventDefault(); - const offset = ScrollSpy._offset(scrollspy.el).top + 1; - - anim({ - targets: [document.documentElement, document.body], - scrollTop: offset - scrollspy.options.scrollOffset, - duration: 400, - easing: 'easeOutCubic' - }); - + scrollspy.el.scrollIntoView({behavior: 'smooth'}); break; } }