From 816d101ce612cad018767284d71ed25bd293f9db Mon Sep 17 00:00:00 2001 From: leejimqiu Date: Tue, 8 Mar 2022 16:57:41 +0800 Subject: [PATCH] fix(toast): increase the z-index value to over popup --- .prettierrc.yml | 2 +- package.json | 4 ++-- src/popup/popup.less | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.prettierrc.yml b/.prettierrc.yml index 52e922dcc..a13251c35 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -1,5 +1,5 @@ # 一行最多 100 字符 -printWidth: 100 +printWidth: 120 # 使用 2 个空格缩进 tabWidth: 2 # 不使用缩进符,而使用空格 diff --git a/package.json b/package.json index b42554ad6..efd541d04 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ } }, "lint-staged": { - "{src,example,script}/**/*.{js,ts,wxml,html,json,wxs}": [ + "{src,example,script}/**/*.{js,ts,wxml,html,json,wxs,less}": [ "prettier --write" ], "{src,example}/**/*.{js,ts}": [ @@ -102,4 +102,4 @@ "dependencies": { "dayjs": "^1.10.7" } -} +} \ No newline at end of file diff --git a/src/popup/popup.less b/src/popup/popup.less index b735d7174..b8617c5d1 100644 --- a/src/popup/popup.less +++ b/src/popup/popup.less @@ -1,12 +1,12 @@ @import '../common/style/index.less'; -@popup: ~"@{prefix}-popup"; -@popup-position: ~"@{popup}--position"; -@popup-transition: ~"@{popup}--transition"; +@popup: ~'@{prefix}-popup'; +@popup-position: ~'@{popup}--position'; +@popup-transition: ~'@{popup}--transition'; .@{popup} { position: fixed; - z-index: 2500; + z-index: 1500; top: 0; left: 0; display: flex; @@ -21,7 +21,7 @@ left: 0; width: 100%; height: 100%; - background-color: rgba(0, 0, 0, .6); + background-color: rgba(0, 0, 0, 0.6); } &__content { @@ -72,7 +72,7 @@ .@{popup}__content { opacity: 0; - transform: scale(.8); + transform: scale(0.8); } &.@{popup-position}-top { @@ -103,13 +103,13 @@ &.@{popup-transition}-enter-to { .@{popup}__overlay { opacity: 1; - transition: opacity .3s; + transition: opacity 0.3s; } .@{popup}__content { opacity: 1; transform: none; - transition: opacity .3s, transform .3s; + transition: opacity 0.3s, transform 0.3s; } &.@{popup-position}-top { @@ -175,13 +175,13 @@ &.@{popup-transition}-leave-to { .@{popup}__overlay { opacity: 0; - transition: opacity .3s; + transition: opacity 0.3s; } .@{popup}__content { opacity: 0; - transform: scale(.8); - transition: opacity .3s, transform .3s; + transform: scale(0.8); + transition: opacity 0.3s, transform 0.3s; } &.@{popup-position}-top {