Skip to content

Commit 2843d1a

Browse files
committed
Merge pull request #4 from zhangxinxu/develop
Develop
2 parents cc6c348 + 96f08e1 commit 2843d1a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/mobilebone.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ html, body, .page {
2121
overflow: hidden;
2222
}
2323
.page {
24-
position: absolute;
24+
position: absolute; left: 0; top: 0;
2525
-webkit-animation: .35s ease-in-out;
2626
animation: .35s ease-in-out;
2727
}

src/mobilebone.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,9 @@
487487

488488
// do ajax
489489
// get mask and loading element
490-
ele_mask = ele_mask || document.querySelector("body > ." + this.classMask);
490+
if (typeof attr_mask != "string") {
491+
ele_mask = document.querySelector("body > ." + this.classMask);
492+
}
491493
if (ele_mask == null) {
492494
ele_mask = document.createElement("div");
493495
ele_mask.className = this.classMask;

test/test.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ a { text-decoration: none; color: inherit; }
44
li > a { display: block; line-height: 32px; padding-left: .5em; margin-top: -1px; border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; box-shadow: inset 0 1px #fbfbfb; background-color: #eee; position: relative; }
55
a:not(.follow) > .mask { left: 0; top: 0; }
66
.follow > .mask { display: inline; width: 32px; height: 32px; background-color: transparent; }
7-
.page > a[data-rel="back"] { display: inline-block; line-height: 32px; margin: .5em; padding: 0 1em; border: 1px solid #ccc; border-left: 0; border-radius: 0 3px 3px 0; background-color: #eee; position: relative; left: 13px; }
7+
.page > a[data-rel="back"] { display: inline-block; line-height: 32px; margin: .5em; padding: 0 1em; border: 1px solid #ccc; border-left: 0; border-radius: 0 3px 3px 0; background-color: #eee; position: relative; left: 13px; -webkit-tap-highlight-color: rgba(0,0,0,0); }
88
.page > a[data-rel="back"]::before { content:''; width: 23px; height: 23px; border-left: 1px solid #ccc; border-bottom: 1px solid #ccc; border-bottom-left-radius: 3px; background-color: #eee; position: absolute; left: -12px; top: 4px; -webkit-transform: rotate(45deg); transform: rotate(45deg); }
99
.page > h2, .page > p { padding-left: .5em; }
1010

0 commit comments

Comments
 (0)