Skip to content

Commit faa1ca4

Browse files
author
zhangxinxu
committed
merger master
merger master
2 parents 4a19a38 + d444e8e commit faa1ca4

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

src/mobilebone.css

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*!
1+
/*!
22
* mobilebone.css
33
* by zhangxinxu(.com) 2014-09-26
44
* some necessary CSS for mobilebone.js
@@ -55,25 +55,25 @@ html, body, .page {
5555
}
5656
.loading { /* more info: http://www.zhangxinxu.com/wordpress/?p=3357 */
5757
width: 3px; height:3px;
58-
border-radius: 100%;
58+
border-radius: 100%;
5959
box-shadow: 0 -10px 0 1px currentColor, /* top, 1px expand */
60-
10px 0px currentColor, /* right */
60+
10px 0px currentColor, /* right */
6161
0 10px currentColor, /* bottom */
6262
-10px 0 currentColor, /* left */
63-
63+
6464
-7px -7px 0 .5px currentColor, /* left-top, 0.5px expand */
65-
7px -7px 0 1.5px currentColor, /* right-top, 1.5px expand */
65+
7px -7px 0 1.5px currentColor, /* right-top, 1.5px expand */
6666
7px 7px currentColor, /* right-bottom */
6767
-7px 7px currentColor; /* left-bottom */
6868
-webkit-animation: loading 1s step-start infinite;
69-
animation: loading 1s step-start infinite;
69+
animation: loading 1s step-start infinite;
7070
/*center*/
7171
position: absolute;
7272
top: 0; right: 0; bottom: 0; left: 0;
7373
margin: auto;
7474
}
7575

76-
/* Default animation - slide, you can visit '/test/transition/aniamte.css' to get more styles of animation */
76+
/* Default animation - slide, you can visit 'src/mobilebone.aniamte.css' to get more styles of animation */
7777
.slide.in {
7878
-webkit-animation-name: slideinfromright;
7979
animation-name: slideinfromright;
@@ -92,32 +92,33 @@ html, body, .page {
9292
}
9393

9494
@-webkit-keyframes slideinfromright {
95-
from { -webkit-transform: translateX(100%); }
96-
to { -webkit-transform: translateX(0); }
95+
from { -webkit-transform: translate3d(100%,0,0); }
96+
to { -webkit-transform: translate3d(0,0,0); }
9797
}
9898
@keyframes slideinfromright {
9999
from { transform: translateX(100%); }
100100
to { transform: translateX(0); }
101101
}
102102
@-webkit-keyframes slideinfromleft {
103-
from { -webkit-transform: translateX(-100%); }
104-
to { -webkit-transform: translateX(0); }
103+
from { -webkit-transform: translate3d(-100%,0,0); }
104+
to { -webkit-transform: translate3d(0,0,0); }
105105
}
106106
@keyframes slideinfromleft {
107107
from { transform: translateX(-100%); }
108108
to { transform: translateX(0); }
109109
}
110+
/* keyframes for slideout to sides */
110111
@-webkit-keyframes slideouttoleft {
111-
from { -webkit-transform: translateX(0); }
112-
to { -webkit-transform: translateX(-100%); }
112+
from { -webkit-transform: translate3d(0,0,0); }
113+
to { -webkit-transform: translate3d(-100%,0,0); }
113114
}
114115
@keyframes slideouttoleft {
115116
from { transform: translateX(0); }
116117
to { transform: translateX(-100%); }
117118
}
118119
@-webkit-keyframes slideouttoright {
119-
from { -webkit-transform: translateX(0); }
120-
to { -webkit-transform: translateX(100%); }
120+
from { -webkit-transform: translate3d(0,0,0); }
121+
to { -webkit-transform: translate3d(100%,0,0); }
121122
}
122123
@keyframes slideouttoright {
123124
from { transform: translateX(0); }
@@ -146,4 +147,4 @@ html, body, .page {
146147
75% { transform: rotate(270deg); }
147148
87% { transform: rotate(315deg); }
148149
90% { transform: rotate(360deg); }
149-
}
150+
}

src/mobilebone.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@
964964
};
965965

966966
/**
967-
* privatemethod: convert query string to key-value object
967+
* private method: convert query string to key-value object
968968
**/
969969
var _queryToObject = function(string) {
970970
var obj = {};

0 commit comments

Comments
 (0)