Skip to content

Commit

Permalink
Merge pull request #231 from Tencent/fix/toast/zIndex
Browse files Browse the repository at this point in the history
fix(toast): increase the z-index value to over popup
  • Loading branch information
LeeJim authored Mar 8, 2022
2 parents e9f6825 + 816d101 commit 94f872b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .prettierrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 一行最多 100 字符
printWidth: 100
printWidth: 120
# 使用 2 个空格缩进
tabWidth: 2
# 不使用缩进符,而使用空格
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}": [
Expand All @@ -102,4 +102,4 @@
"dependencies": {
"dayjs": "^1.10.7"
}
}
}
22 changes: 11 additions & 11 deletions src/popup/popup.less
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -72,7 +72,7 @@

.@{popup}__content {
opacity: 0;
transform: scale(.8);
transform: scale(0.8);
}

&.@{popup-position}-top {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 94f872b

Please sign in to comment.