From 7a705e0869de27e3e505180639f3c508c8eff0aa Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Wed, 27 Aug 2025 09:36:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85respond-to?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/screen.code-snippets | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.vscode/screen.code-snippets b/.vscode/screen.code-snippets index 82199420..6d9b273b 100644 --- a/.vscode/screen.code-snippets +++ b/.vscode/screen.code-snippets @@ -139,6 +139,16 @@ "description": "(841px, 1440px)", "scope": "scss, less" }, + "(840, 1680)": { + "prefix": ["w840-1680", "@include responsd-to('pad_v-pc_s')"], + "body": [ + "@include respond-to('pad_v-pc_s') {", + " $1 ", + "}" + ], + "description": "(840px, 1680px)", + "scope": "scss, less" + }, "(1441-1920)": { "prefix": ["w1440-1920", "@include responsd-to('pc')"], "body": [ -- Gitee From 4deaebb99413c91c8bc8ea73439cfdb295ff95cc Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Wed, 27 Aug 2025 09:37:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0button=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/opendesign/src/button/style/index.scss | 2 +- packages/opendesign/src/button/style/media.scss | 13 +++++++++++-- packages/opendesign/src/button/style/var.scss | 1 - 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/opendesign/src/button/style/index.scss b/packages/opendesign/src/button/style/index.scss index e6b6f59b..8bb47c58 100644 --- a/packages/opendesign/src/button/style/index.scss +++ b/packages/opendesign/src/button/style/index.scss @@ -1,3 +1,3 @@ @use './style.scss' as *; -@use './media.scss' as *; @use './var.scss' as *; +@use './media.scss' as *; diff --git a/packages/opendesign/src/button/style/media.scss b/packages/opendesign/src/button/style/media.scss index 1d53a840..ee75a82a 100644 --- a/packages/opendesign/src/button/style/media.scss +++ b/packages/opendesign/src/button/style/media.scss @@ -1,11 +1,20 @@ @use '../../_styles/mixin.scss' as *; -@include respond-to('laptop') { +@include respond-to('pad_v-pc_s') { .o-btn-large { + --btn-height: 36px; --btn-padding: 0 15px; + font-size: var(--o-font_size-tip1); + line-height: var(--o-line_height-tip1); --btn-icon-size: var(--o-icon_size-s); - + } +} +@include respond-to('<=pc_s') { + .o-btn-medium { + --btn-height: 28px; + --btn-padding: 0 15px; font-size: var(--o-font_size-tip1); line-height: var(--o-line_height-tip1); + --btn-icon-size: var(--o-icon_size-xs); } } diff --git a/packages/opendesign/src/button/style/var.scss b/packages/opendesign/src/button/style/var.scss index 49e2c789..6f783a16 100644 --- a/packages/opendesign/src/button/style/var.scss +++ b/packages/opendesign/src/button/style/var.scss @@ -185,7 +185,6 @@ } .o-btn-round-pill { --btn-radius: var(--o-control_size-l); - --btn-gap: 6px; } .o-btn-text { -- Gitee From c4971ed6b397e56fead97b1edd79842653df689c Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Wed, 27 Aug 2025 09:41:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20button=E6=96=B0=E5=A2=9E--btn-gap-p?= =?UTF-8?q?refix=E5=8F=8A--btn-gap-suffix=E5=8F=98=E9=87=8F=E4=BB=A5?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=8E=A7=E5=88=B6=E5=89=8D=E7=BC=80=E5=8F=8A?= =?UTF-8?q?=E5=90=8E=E7=BC=80=E5=9B=BE=E6=A0=87=E5=A4=96=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/opendesign/src/button/style/style.scss | 4 ++-- packages/opendesign/src/button/style/var.scss | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/opendesign/src/button/style/style.scss b/packages/opendesign/src/button/style/style.scss index e0d3a703..79d6720c 100644 --- a/packages/opendesign/src/button/style/style.scss +++ b/packages/opendesign/src/button/style/style.scss @@ -103,7 +103,7 @@ .o-btn-prefix { display: inline-flex; align-items: center; - margin-right: var(--btn-gap); + margin-right: var(--btn-gap-prefix); font-size: var(--btn-icon-size); .o-btn-icon-only & { @@ -116,6 +116,6 @@ .o-btn-suffix { display: inline-flex; align-items: center; - margin-left: var(--btn-gap); + margin-left: var(--btn-gap-suffix); font-size: var(--btn-icon-size); } diff --git a/packages/opendesign/src/button/style/var.scss b/packages/opendesign/src/button/style/var.scss index 6f783a16..a30c3c1b 100644 --- a/packages/opendesign/src/button/style/var.scss +++ b/packages/opendesign/src/button/style/var.scss @@ -158,6 +158,8 @@ .o-btn-small { --btn-radius: var(--o-radius_control-xs); --btn-gap: 2px; + --btn-gap-prefix: var(--btn-gap); + --btn-gap-suffix: var(--btn-gap); --btn-padding: 0 11px; --btn-icon-size: var(--o-icon_size-xs); --btn-height: var(--o-control_size-s); @@ -167,6 +169,8 @@ --btn-radius: var(--o-radius_control-s); --btn-gap: 8px; + --btn-gap-prefix: var(--btn-gap); + --btn-gap-suffix: var(--btn-gap); --btn-padding: 0 15px; --btn-icon-size: var(--o-icon_size-xs); --btn-height: var(--o-control_size-m); @@ -176,6 +180,8 @@ --btn-radius: var(--o-radius_control-s); --btn-gap: 8px; + --btn-gap-prefix: var(--btn-gap); + --btn-gap-suffix: var(--btn-gap); --btn-padding: 0 23px; --btn-icon-size: var(--o-icon_size-m); --btn-height: var(--o-control_size-l); -- Gitee