From 55c4394757192229b52c8463b45ccbfbcac72917 Mon Sep 17 00:00:00 2001 From: zhengyi Date: Tue, 6 Feb 2024 21:39:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20=20Fix=20no=20parent=20node?= =?UTF-8?q?=20for=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix https://git.mczhengyi.top/zhengyi/halo-render/issues/8 Fix https://git.mczhengyi.top/zhengyi/halo-render/issues/10 --- .gitignore | 1 + package.json | 3 ++- src/less/drive.less | 2 +- src/less/git.less | 2 +- src/less/render.less | 13 +++++++++++++ src/less/tips.less | 2 +- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e715dab..2af4f6b 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,4 @@ dist .pnp.* .idea +.DS_Store \ No newline at end of file diff --git a/package.json b/package.json index 52ac092..acf0bad 100644 --- a/package.json +++ b/package.json @@ -28,5 +28,6 @@ "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.15.1" - } + }, + "packageManager": "pnpm@8.0.0" } diff --git a/src/less/drive.less b/src/less/drive.less index 8127267..d093798 100644 --- a/src/less/drive.less +++ b/src/less/drive.less @@ -1,6 +1,6 @@ @import "constant"; -.drive { +.halo-render.drive { border: 1px solid @secondary-light; border-radius: @border-radius; padding: 10px; diff --git a/src/less/git.less b/src/less/git.less index 5da78ec..6bab6bd 100644 --- a/src/less/git.less +++ b/src/less/git.less @@ -2,7 +2,7 @@ @git-color: #3478CD; -.git { +.halo-render.git { display: flex; gap: 10px; border: 1px solid #ececec; diff --git a/src/less/render.less b/src/less/render.less index 904adf7..c8fd87e 100644 --- a/src/less/render.less +++ b/src/less/render.less @@ -32,6 +32,19 @@ font-family: iconfont, sans-serif; font-size: 16px; } + + img, a { + width: initial; + height: initial; + min-width: initial; + min-height: initial; + max-width: initial; + max-height: initial; + border-radius: initial; + border: initial; + margin: initial; + padding: initial; + } } .halo-render-wrapper { diff --git a/src/less/tips.less b/src/less/tips.less index 403c4c5..9a9112d 100644 --- a/src/less/tips.less +++ b/src/less/tips.less @@ -2,7 +2,7 @@ @border-width: 6px; @border-type: solid; -.tips { +.halo-render.tips { position: relative; padding: 15px 15px; border-left-style: @border-type; From 0726c0be25092b6ec82826c809922d11139b8f2f Mon Sep 17 00:00:00 2001 From: zhengyi Date: Tue, 6 Feb 2024 21:48:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20=20Add=20default=20color=20f?= =?UTF-8?q?or=20tips?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix https://git.mczhengyi.top/zhengyi/halo-render/issues/11 --- src/less/tips.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/less/tips.less b/src/less/tips.less index 9a9112d..058dfaf 100644 --- a/src/less/tips.less +++ b/src/less/tips.less @@ -8,6 +8,7 @@ border-left-style: @border-type; border-left-width: @border-width; border-radius: @border-radius; + color: #333333; border-left-color: #818181; background-color: #F4F4F4;