From 0026b84622a03c8a91904872b77cb297471fa326 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 11 Oct 2024 11:21:04 +0800 Subject: [PATCH] :art: table https://github.com/siyuan-note/siyuan/issues/12713 --- app/appearance/themes/daylight/theme.css | 29 ++++++++++--------- app/appearance/themes/midnight/theme.css | 3 ++ .../assets/scss/component/_typography.scss | 5 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index bf6a5d42d..58300f359 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/app/appearance/themes/daylight/theme.css @@ -17,7 +17,7 @@ --b3-theme-on-primary: #fff; --b3-theme-on-secondary: #fff; --b3-theme-on-background: #222; - --b3-theme-on-background-rgba: rgb(34, 34, 34, 0.86); + --b3-theme-on-background-rgba: rgb(34, 34, 34, .86); --b3-theme-on-surface: #5f6368; --b3-theme-on-surface-light: rgba(95, 99, 104, .68); --b3-theme-on-error: #fff; @@ -73,16 +73,16 @@ /* 卡片背景 */ --b3-card-error-color: rgb(97, 26, 21); --b3-card-error-background: #f5d1cf; - --b3-card-error-background-rgba: rgb(245, 209, 207, 0.86); + --b3-card-error-background-rgba: rgb(245, 209, 207, .86); --b3-card-warning-color: rgb(102, 60, 0); --b3-card-warning-background: #ffe8c8; - --b3-card-warning-background-rgba: rgb(255, 232, 200, 0.86); + --b3-card-warning-background-rgba: rgb(255, 232, 200, .86); --b3-card-info-color: rgb(13, 60, 97); --b3-card-info-background: #d6eaf9; - --b3-card-info-background-rgba: rgb(214, 234, 249, 0.86); + --b3-card-info-background-rgba: rgb(214, 234, 249, .86); --b3-card-success-color: rgb(30, 70, 32); --b3-card-success-background: #d7eed8; - --b3-card-success-background-rgba: rgb(215, 238, 216, 0.86); + --b3-card-success-background-rgba: rgb(215, 238, 216, .86); /* 自定义文字 */ --b3-font-color1: var(--b3-card-error-color); @@ -115,14 +115,14 @@ --b3-font-background2-rgba: var(--b3-card-warning-background-rgba); --b3-font-background3-rgba: var(--b3-card-info-background-rgba); --b3-font-background4-rgba: var(--b3-card-success-background-rgba); - --b3-font-background5-rgba: rgb(226, 227, 228, 0.86); - --b3-font-background6-rgba: rgb(172, 208, 252, 0.86); - --b3-font-background7-rgba: rgb(253, 238, 214, 0.86); - --b3-font-background8-rgba: rgb(250, 225, 207, 0.86); - --b3-font-background9-rgba: rgb(253, 213, 231, 0.86); - --b3-font-background10-rgba: rgb(230, 199, 230, 0.86); - --b3-font-background11-rgba: rgb(222, 240, 217, 0.86); - --b3-font-background12-rgba: rgb(250, 227, 228, 0.86); + --b3-font-background5-rgba: rgb(226, 227, 228, .86); + --b3-font-background6-rgba: rgb(172, 208, 252, .86); + --b3-font-background7-rgba: rgb(253, 238, 214, .86); + --b3-font-background8-rgba: rgb(250, 225, 207, .86); + --b3-font-background9-rgba: rgb(253, 213, 231, .86); + --b3-font-background10-rgba: rgb(230, 199, 230, .86); + --b3-font-background11-rgba: rgb(222, 240, 217, .86); + --b3-font-background12-rgba: rgb(250, 227, 228, .86); --b3-font-background13-rgba: var(--b3-theme-on-background-rgba); /* 动画效果 */ @@ -193,6 +193,9 @@ --b3-pdf-background6: #69B0F2; --b3-pdf-background7: #C885DA; --b3-pdf-dark: #212224; + + /* 表格偶数行 */ + --b3-table-even-background: rgba(0, 0, 0, .02); } :lang(ja_JP):root { diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css index 6d05d4516..3c0c8250e 100644 --- a/app/appearance/themes/midnight/theme.css +++ b/app/appearance/themes/midnight/theme.css @@ -192,6 +192,9 @@ --b3-pdf-background6: #69B0F2; --b3-pdf-background7: #C885DA; --b3-pdf-dark: #212224; + + /* 表格偶数行 */ + --b3-table-even-background: rgba(255, 255, 255, .03); } :lang(ja_JP):root { diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss index 4ba7ef940..d30322263 100644 --- a/app/src/assets/scss/component/_typography.scss +++ b/app/src/assets/scss/component/_typography.scss @@ -212,13 +212,12 @@ border-spacing: 0; width: max-content; - tr:nth-child(2n) td { - background-color: var(--b3-theme-background); + tr:nth-child(even) td { + background-color: var(--b3-table-even-background); } td, th { - background-color: var(--b3-theme-surface); padding: 4px 8px; border: 1px solid var(--b3-theme-surface-lighter); box-sizing: border-box;