Skip to content

Commit

Permalink
fix all component z-index
Browse files Browse the repository at this point in the history
  • Loading branch information
warmhug committed Sep 1, 2016
1 parent edb4edb commit bb875c2
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 25 deletions.
2 changes: 1 addition & 1 deletion components/list-view/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
position: fixed;
top: 0;
right: 0;
z-index: 1999;
z-index: @listViewQsbZIndex;
text-align: center;
color: @color-link;
font-size: @font-size-caption;
Expand Down
17 changes: 16 additions & 1 deletion components/modal/style/Dialog.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
.@{modalPrefixClass} {
position: relative;

&-mask {
position: fixed;
top: 0;
right: 0;
left: 0;
bottom: 0;
height: 100%;
z-index: @modalZIndex;
background-color: @fill-overlay-inverse;
&-hidden {
display: none;
}
}

&-wrap {
position: fixed;
overflow: auto;
Expand All @@ -8,7 +23,7 @@
bottom: 0;
left: 0;
height: 100%;
z-index: 1050;
z-index: @modalZIndex;
-webkit-overflow-scrolling: touch;
outline: 0;
.display-box();
Expand Down
15 changes: 0 additions & 15 deletions components/modal/style/Mask.less

This file was deleted.

1 change: 0 additions & 1 deletion components/modal/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

@modalPrefixClass: am-modal;

@import './Mask.less';
@import './Dialog.less';

.@{modalPrefixClass} {
Expand Down
2 changes: 1 addition & 1 deletion components/progress/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
width: 100%;
top: 0;
left: 0;
z-index: 999;
z-index: @progressZIndex;
}
&-hide-outer {
background-color: transparent;
Expand Down
14 changes: 9 additions & 5 deletions components/style/themes/default.less
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,13 @@
@table-title-height: 60px;

// z-index
@actionSheetZIndex: 1000;
@datePickerZIndex: 1000;
@popoverZIndex: 1999; // 最大
@toastZIndex: 1999; // 最大
@actionSheetZIndex: 1000; // actonsheet 会放到 popup / modal 中
@datePickerZIndex: 1000; // picker 会放到 popup / modal 中
@pickerZIndex: 1000;
@popupZIndex: 1000;
@popoverZIndex: 1999;
@toastZIndex: 1999;
@popupZIndex: 999;
@modalZIndex: 999; // modal.alert 应该最大,其他应该较小
// other z-index
@progressZIndex: 2000;
@listViewQsbZIndex: 998;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "antd-mobile",
"version": "0.8.0",
"version": "0.8.1",
"description": "基于 React 的移动设计规范实现",
"homepage": "http://mobile.ant.design",
"keywords": [
Expand Down

1 comment on commit bb875c2

@warmhug
Copy link
Contributor Author

@warmhug warmhug commented on bb875c2 Sep 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@silentcloud 注意下

Please sign in to comment.