Fix: restore OpenType ligatures broken by letter-spacing

apqx · apqx · commit ca741958e616 · 2025-09-29T22:32:01.000+08:00
diff --git a/npm/dist/assets/blog-index.css b/npm/dist/assets/blog-index.css
diff --git a/npm/dist/assets/blog-scaffold.css b/npm/dist/assets/blog-scaffold.css
diff --git a/npm/dist/blog-scaffold.js b/npm/dist/blog-scaffold.js
diff --git a/npm/src/component/dialog/AboutMeDialog.tsx b/npm/src/component/dialog/AboutMeDialog.tsx
@@ -43,7 +43,7 @@ class AboutMeDialog extends BasicDialog<BasicDialogProps, any> {
                     <Button text="Git" onClick={null} className="btn-tag" />
                 </section>
                 <p className="about-me-description">九五后，旅居杭州，<a
-                    href={this.getKunQvLink()}>昆虫</a>，野生散养攻城狮，“十分”“业余”摄影 Fans。联系我可以通过<a href="mailto:safari@mudan.me">电子邮件</a>，如果有必要也可以用<a
+                    href={this.getKunQvLink()}>昆虫</a>，野生散养攻城狮，“十分”“业余”摄影 Fans。联系我可以通过<a href="mailto:safari@mudan.me">电子邮件</a>，如果有必要也可用<a
                         href="https://apqx.oss-cn-hangzhou.aliyuncs.com/blog/site/wechat.jpg" target="_blank">微信</a>。</p>
                 <ul className="mdc-deprecated-list mdc-deprecated-list--one-line dialog-link-list" id="about-me-dialog_link_list">
                     <LinkItem link="https://github.com/apqx" title="GitHub" first={true} last={false} />
diff --git a/npm/src/component/dialog/BasicDialog.scss b/npm/src/component/dialog/BasicDialog.scss
@@ -103,7 +103,7 @@
     height: 3.2rem;
     padding: 0;
     border-radius: 0;
-    
+
     @include button.container-fill-color(var(--dialog-action-btn-bg));
     @include button.ink-color(var(--dialog-action-btn-ink));
     // 启用Ripple的radius-bounded可能导致某些东西溢出元素，导致整个页面宽度不正常可以横向滚动
diff --git a/npm/src/component/drawer.scss b/npm/src/component/drawer.scss
@@ -24,10 +24,14 @@
     border: none;
     padding-left: var(--drawer-padding-horizontal);
     padding-right: var(--drawer-padding-horizontal);
+    // background-color: rgba($color: map.get(base.$surface, "light"), $alpha: 0.8);
+    // backdrop-filter: blur(30px);
+    // -webkit-backdrop-filter: blur(30px);
 }
 
 .dark .mdc-drawer {
     @include elevation.elevation(map.get(base.$drawer-elevation, "elevation"), map.get(base.$drawer-elevation, "shadow-dark"), 0);
+    // background-color: rgba($color: map.get(base.$surface, "dark"), $alpha: 0.8);
 }
 
 .mdc-drawer-scroll-lock {
diff --git a/npm/src/component/react/IndexList.scss b/npm/src/component/react/IndexList.scss
@@ -22,8 +22,8 @@ body {
 }
 
 .index-top-card-container {
-    padding-top: 0.4rem;
-    padding-bottom: 0.5rem;
+    padding-top: 0.1rem;
+    padding-bottom: 0.18rem;
     padding-left: var(--index-card-padding-horizontal);
     padding-right: var(--index-card-padding-horizontal);
 }
@@ -173,7 +173,8 @@ body {
     }
 
     .index-top-card-container {
-        padding-top: 0.35rem;
+        padding-top: 0.08rem;
+        padding-bottom: 0.15rem;
     }
 }
 
@@ -184,10 +185,6 @@ body {
         --index-card-padding-horizontal: 2rem;
     }
 
-    .index-top-card-container {
-        padding-top: 0.35rem;
-    }
-
     .index-author {
         font-size: calc(var(--mdc-typography-body1-font-size) - 0.2rem);
     }
diff --git a/npm/src/component/theme.scss b/npm/src/component/theme.scss
@@ -146,6 +146,8 @@ body {
         --mdc-typography-body1-letter-spacing: normal;
         --mdc-typography-body1-font-weight: var(--font-weight-normal);
 
+        --mdc-typography-body2-letter-spacing: normal;
+
         // 代码字体
         --text-code-font-family: #{base.$text-font-code-block};
         // 代码字重，注意段落中的代码块字重，有时候同样字重的中英文字体显示并不一致，需要单独设置
@@ -162,17 +164,26 @@ body {
 
         --mdc-typography-headline1-font-size: calc(var(--mdc-typography-body1-font-size) + 0.6rem);
         --mdc-typography-headline1-font-weight: var(--mdc-typography-body1-font-weight);
+        --mdc-typography-headline1-letter-spacing: normal;
 
         --mdc-typography-headline2-font-size: calc(var(--mdc-typography-body1-font-size) + 0.6rem);
         --mdc-typography-headline2-line-height: calc(var(--mdc-typography-body1-font-size) + 1.2rem);
         --mdc-typography-headline2-font-weight: var(--mdc-typography-body1-font-weight);
+        --mdc-typography-headline2-letter-spacing: normal;
 
         --mdc-typography-headline3-font-size: calc(var(--mdc-typography-body1-font-size) + 0.5rem);
         --mdc-typography-headline3-line-height: calc(var(--mdc-typography-body1-font-size) + 1rem);
         --mdc-typography-headline3-font-weight: var(--mdc-typography-body1-font-weight);
+        --mdc-typography-headline3-letter-spacing: normal;
 
+        --mdc-typography-headline4-letter-spacing: normal;
+        --mdc-typography-headline5-letter-spacing: normal;
+        
         --mdc-typography-headline6-font-size: calc(var(--mdc-typography-body1-font-size) + 0.25rem);
         --mdc-typography-headline6-font-weight: var(--mdc-typography-body1-font-weight);
+        --mdc-typography-headline6-letter-spacing: normal;
+
+        --mdc-typography-button-letter-spacing: normal;
 
         // drawer list圆角
         --mdc-shape-small: 0.5rem;
diff --git a/npm/src/repository/LocalRepository.ts b/npm/src/repository/LocalRepository.ts
@@ -12,9 +12,10 @@ export class LocalRepository {
         this.saveString(key, String(value))
     }
     
-    getBoolean(key: string): boolean {
+    getBoolean(key: string): boolean | null {
         // 默认为false
         const value = this.getString(key)
+        if (value == null || value == "") return null
         return value === "true";
     }
 
@@ -31,23 +32,26 @@ export class LocalRepository {
     }
 
     getFixedTopbarOn(): boolean {
-        return this.getBoolean(this.KEY_FIXED_TOPBAR)
+        return this.getBoolean(this.KEY_FIXED_TOPBAR) ?? false
     }
 
     saveHandwritingFontOn(on: boolean) {
         this.saveBoolean(this.KEY_HANDWRITTEN_FONT, on)
     }
 
     getHandWritingFontOn(): boolean {
-        return this.getBoolean(this.KEY_HANDWRITTEN_FONT)
+        return this.getBoolean(this.KEY_HANDWRITTEN_FONT) ?? false
     }
 
     saveNotoSerifSCFontOn(on: boolean) {
         this.saveBoolean(this.KEY_NOTO_SERIF_SC_FONT, on)
     }
 
+    /**
+     * 获取思源宋体设置，默认开启
+     */
     getNotoSerifSCFontOn(): boolean {
-        return this.getBoolean(this.KEY_NOTO_SERIF_SC_FONT)
+        return this.getBoolean(this.KEY_NOTO_SERIF_SC_FONT) ?? true
     }
 
     getTheme(): string {

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,14 @@`
`24`	`24`	`border: none;`
`25`	`25`	`padding-left: var(--drawer-padding-horizontal);`
`26`	`26`	`padding-right: var(--drawer-padding-horizontal);`
	`27`	`+ // background-color: rgba($color: map.get(base.$surface, "light"), $alpha: 0.8);`
	`28`	`+ // backdrop-filter: blur(30px);`
	`29`	`+ // -webkit-backdrop-filter: blur(30px);`
`27`	`30`	`}`
`28`	`31`
`29`	`32`	`.dark .mdc-drawer {`
`30`	`33`	`@include elevation.elevation(map.get(base.$drawer-elevation, "elevation"), map.get(base.$drawer-elevation, "shadow-dark"), 0);`
	`34`	`+ // background-color: rgba($color: map.get(base.$surface, "dark"), $alpha: 0.8);`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`.mdc-drawer-scroll-lock {`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ body {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`.index-top-card-container {`
`25`		`- padding-top: 0.4rem;`
`26`		`- padding-bottom: 0.5rem;`
	`25`	`+ padding-top: 0.1rem;`
	`26`	`+ padding-bottom: 0.18rem;`
`27`	`27`	`padding-left: var(--index-card-padding-horizontal);`
`28`	`28`	`padding-right: var(--index-card-padding-horizontal);`
`29`	`29`	`}`
`@@ -173,7 +173,8 @@ body {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`.index-top-card-container {`
`176`		`- padding-top: 0.35rem;`
	`176`	`+ padding-top: 0.08rem;`
	`177`	`+ padding-bottom: 0.15rem;`
`177`	`178`	`}`
`178`	`179`	`}`
`179`	`180`
`@@ -184,10 +185,6 @@ body {`
`184`	`185`	`--index-card-padding-horizontal: 2rem;`
`185`	`186`	`}`
`186`	`187`
`187`		`- .index-top-card-container {`
`188`		`- padding-top: 0.35rem;`
`189`		`- }`
`190`		`-`
`191`	`188`	`.index-author {`
`192`	`189`	`font-size: calc(var(--mdc-typography-body1-font-size) - 0.2rem);`
`193`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,10 @@ export class LocalRepository {`
`12`	`12`	`this.saveString(key, String(value))`
`13`	`13`	`}`
`14`	`14`
`15`		`- getBoolean(key: string): boolean {`
	`15`	`+ getBoolean(key: string): boolean \| null {`
`16`	`16`	`// 默认为false`
`17`	`17`	`const value = this.getString(key)`
	`18`	`+ if (value == null \|\| value == "") return null`
`18`	`19`	`return value === "true";`
`19`	`20`	`}`
`20`	`21`
`@@ -31,23 +32,26 @@ export class LocalRepository {`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`getFixedTopbarOn(): boolean {`
`34`		`- return this.getBoolean(this.KEY_FIXED_TOPBAR)`
	`35`	`+ return this.getBoolean(this.KEY_FIXED_TOPBAR) ?? false`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`saveHandwritingFontOn(on: boolean) {`
`38`	`39`	`this.saveBoolean(this.KEY_HANDWRITTEN_FONT, on)`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`getHandWritingFontOn(): boolean {`
`42`		`- return this.getBoolean(this.KEY_HANDWRITTEN_FONT)`
	`43`	`+ return this.getBoolean(this.KEY_HANDWRITTEN_FONT) ?? false`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`saveNotoSerifSCFontOn(on: boolean) {`
`46`	`47`	`this.saveBoolean(this.KEY_NOTO_SERIF_SC_FONT, on)`
`47`	`48`	`}`
`48`	`49`
	`50`	`+ /**`
	`51`	`+ * 获取思源宋体设置，默认开启`
	`52`	`+ */`
`49`	`53`	`getNotoSerifSCFontOn(): boolean {`
`50`		`- return this.getBoolean(this.KEY_NOTO_SERIF_SC_FONT)`
	`54`	`+ return this.getBoolean(this.KEY_NOTO_SERIF_SC_FONT) ?? true`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`getTheme(): string {`