Skip to content

Commit 68e4d6f

Browse files
committed
Update references and settings in demo files.
1 parent 84402bd commit 68e4d6f

File tree

6 files changed

+69
-40
lines changed

6 files changed

+69
-40
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.DS_Store
2-
.sass-cache
2+
.sass-cache
3+
config.rb

assets/css/tick.css

+53-25
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
/* $gradient: -webkit-linear-gradient(top, rgba(45,45,45,1) 0%,rgba(70,70,70,1) 30%); */
2-
/* $old_gradient: -webkit-linear-gradient(top, rgba(255,255,255,1) 60%,rgba(190,190,190,1) 100%); */
3-
/* $old_move_gradient: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(180,180,180,1) 100%); */
4-
/* $new_gradient: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(190,190,190,1) 100%); */
5-
/* $new_move_gradient: -webkit-linear-gradient(top, rgba(255,255,255,1) 40%,rgba(180,180,180,1) 100%); */
61
/*
72
Tick.tick-flip
83
*/
9-
/* line 26, sass/tick.scss */
4+
/* line 20, ../scss/tick.scss */
105
.tick-flip + p {
116
clear: both;
127
text-align: right;
138
}
149

15-
/* line 30, sass/tick.scss */
10+
/* line 24, ../scss/tick.scss */
1611
.tick-flip {
1712
position: relative;
1813
float: left;
@@ -40,28 +35,28 @@
4035
text-align: center;
4136
}
4237

43-
/* line 60, sass/tick.scss */
38+
/* line 54, ../scss/tick.scss */
4439
.tick-flip.tick-active {
4540
width: auto;
4641
color: #1e1e1e;
4742
}
4843

49-
/* line 64, sass/tick.scss */
44+
/* line 58, ../scss/tick.scss */
5045
.tick-flip .tick-seperator {
5146
margin: 0 2px;
5247
font-size: 0.6em;
5348
color: #b4b4b4;
5449
}
5550

56-
/* line 69, sass/tick.scss */
51+
/* line 63, ../scss/tick.scss */
5752
.tick-flip .tick-wrapper {
5853
position: relative;
5954
display: inline-block;
6055
margin: 0 2px;
6156
border-radius: 4px;
6257
}
6358

64-
/* line 75, sass/tick.scss */
59+
/* line 69, ../scss/tick.scss */
6560
.tick-flip .tick-wrapper:after {
6661
position: absolute;
6762
display: block;
@@ -74,12 +69,12 @@
7469
background-color: #323232;
7570
}
7671

77-
/* line 87, sass/tick.scss */
72+
/* line 81, ../scss/tick.scss */
7873
.tick-flip .tick-wrapper span {
7974
padding: 0 5px;
8075
}
8176

82-
/* line 91, sass/tick.scss */
77+
/* line 85, ../scss/tick.scss */
8378
.tick-flip .tick-old {
8479
display: block;
8580
border-radius: 4px;
@@ -96,7 +91,7 @@
9691
background-image: linear-gradient(top, #ffffff 60%, #bebebe 100%);
9792
}
9893

99-
/* line 101, sass/tick.scss */
94+
/* line 95, ../scss/tick.scss */
10095
.tick-flip .tick-new {
10196
overflow: hidden;
10297
position: absolute;
@@ -117,7 +112,7 @@
117112
background-image: linear-gradient(top, #ffffff 0%, #bebebe 100%);
118113
}
119114

120-
/* line 118, sass/tick.scss */
115+
/* line 112, ../scss/tick.scss */
121116
.tick-flip .tick-old-move,
122117
.tick-flip .tick-new-move {
123118
overflow: hidden;
@@ -127,12 +122,12 @@
127122
background: white;
128123
}
129124

130-
/* line 126, sass/tick.scss */
125+
/* line 120, ../scss/tick.scss */
131126
.tick-flip .tick-moving {
132127
display: block;
133128
}
134129

135-
/* line 130, sass/tick.scss */
130+
/* line 124, ../scss/tick.scss */
136131
.tick-flip .tick-old-move {
137132
z-index: 999;
138133
bottom: 50%;
@@ -155,7 +150,7 @@
155150
-o-transform-origin: bottom left;
156151
}
157152

158-
/* line 148, sass/tick.scss */
153+
/* line 142, ../scss/tick.scss */
159154
.tick-flip .tick-new-move {
160155
z-index: 997;
161156
height: 100%;
@@ -182,7 +177,7 @@
182177
/*
183178
Tick.tick-scroll
184179
*/
185-
/* line 174, sass/tick.scss */
180+
/* line 167, ../scss/tick.scss */
186181
.tick-scroll {
187182
overflow: hidden;
188183
position: relative;
@@ -202,7 +197,7 @@
202197
/*
203198
Adding depth to the ticker by overlaying some gradients
204199
*/
205-
/* line 197, sass/tick.scss */
200+
/* line 190, ../scss/tick.scss */
206201
.tick-scroll:before,
207202
.tick-scroll:after {
208203
position: absolute;
@@ -214,7 +209,7 @@
214209
border-radius: 5px;
215210
}
216211

217-
/* line 207, sass/tick.scss */
212+
/* line 200, ../scss/tick.scss */
218213
.tick-scroll:before {
219214
*zoom: 1;
220215
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FF282828', endColorstr='#00282828');
@@ -226,7 +221,7 @@
226221
background-image: linear-gradient(top, #282828 0%, #282828 20%, rgba(40, 40, 40, 0) 100%);
227222
}
228223

229-
/* line 211, sass/tick.scss */
224+
/* line 204, ../scss/tick.scss */
230225
.tick-scroll:after {
231226
bottom: 0;
232227
*zoom: 1;
@@ -242,7 +237,7 @@
242237
/*
243238
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
244239
*/
245-
/* line 220, sass/tick.scss */
240+
/* line 213, ../scss/tick.scss */
246241
.tick-scroll .tick-wheel {
247242
position: relative;
248243
display: inline-block;
@@ -253,13 +248,46 @@
253248
background-color: white;
254249
}
255250

256-
/* line 231, sass/tick.scss */
251+
/* line 224, ../scss/tick.scss */
257252
.tick-scroll .tick-wheel span {
258253
display: block;
259254
padding: 16px 0;
260255
}
261256

262-
/* line 236, sass/tick.scss */
257+
/* line 229, ../scss/tick.scss */
263258
.tick-scroll .tick-seperator {
264259
font-weight: normal;
265260
}
261+
262+
/*
263+
Tick.tick-slide
264+
*/
265+
/* line 238, ../scss/tick.scss */
266+
.tick-slide {
267+
display: inline-block;
268+
padding: 10px;
269+
color: white;
270+
background-color: #141414;
271+
}
272+
273+
/* line 245, ../scss/tick.scss */
274+
.tick-slide span {
275+
display: inline-block;
276+
width: 50px;
277+
height: 65px;
278+
border-right: 1px solid #787878;
279+
border-left: 1px solid #787878;
280+
margin-right: 2px;
281+
font-size: 1.5em;
282+
background: url("../img/sprite.gif");
283+
text-indent: -999em;
284+
}
285+
286+
/* line 260, ../scss/tick.scss */
287+
.tick-slide .seperator {
288+
width: 20px;
289+
padding-right: 2px;
290+
padding-left: 0;
291+
border: 0 none;
292+
background: url("../img/seperator.gif") no-repeat top center;
293+
}

demo/assets/js/interface.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ $( document ).ready( function()
22
{
33
$( '.tick' ).ticker(
44
{
5-
delay : 10,
6-
incremental : 100,
5+
delay : 700,
6+
incremental : 1,
77
seperators : true,
88
autostart : true
99
});

demo/bare.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<title></title>
55

6-
<link href="assets/css/reset.css" type="text/css" rel="stylesheet" media="screen">
7-
<link href="../assets/css/layout.css" type="text/css" rel="stylesheet" media="screen">
6+
<link href="assets/css/layout.css" type="text/css" rel="stylesheet" media="screen">
7+
<link href="../assets/css/tick.css" type="text/css" rel="stylesheet" media="screen">
88
</head>
99
<body>
1010

@@ -14,9 +14,9 @@
1414

1515

1616
<script src="assets/js/libs/jquery.min.js" type="text/javascript"></script>
17-
<script src="assets/js/libs/jquey.easing.js" type="text/javascript"></script>
17+
<script src="assets/js/libs/jquery.easing.js" type="text/javascript"></script>
1818
<script src="assets/js/interface.js" type="text/javascript"></script>
1919

20-
<script src="../assets/js/ticker.js" type="text/javascript"></script>
20+
<script src="../assets/js/tick.js" type="text/javascript"></script>
2121
</body>
2222
</html>

demo/flip.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<title></title>
55

6-
<link href="assets/css/reset.css" type="text/css" rel="stylesheet" media="screen">
7-
<link href="../assets/css/layout.css" type="text/css" rel="stylesheet" media="screen">
6+
<link href="assets/css/layout.css" type="text/css" rel="stylesheet" media="screen">
7+
<link href="../assets/css/tick.css" type="text/css" rel="stylesheet" media="screen">
88
</head>
99
<body>
1010

@@ -15,9 +15,9 @@
1515

1616

1717
<script src="assets/js/libs/jquery.min.js" type="text/javascript"></script>
18-
<script src="assets/js/libs/jquey.easing.js" type="text/javascript"></script>
18+
<script src="assets/js/libs/jquery.easing.js" type="text/javascript"></script>
1919
<script src="assets/js/interface.js" type="text/javascript"></script>
2020

21-
<script src="../assets/js/ticker.js" type="text/javascript"></script>
21+
<script src="../assets/js/tick.js" type="text/javascript"></script>
2222
</body>
2323
</html>

demo/scroll.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<title></title>
55

6-
<link href="assets/css/reset.css" type="text/css" rel="stylesheet" media="screen">
7-
<link href="../assets/css/layout.css" type="text/css" rel="stylesheet" media="screen">
6+
<link href="assets/css/layout.css" type="text/css" rel="stylesheet" media="screen">
7+
<link href="../assets/css/tick.css" type="text/css" rel="stylesheet" media="screen">
88
</head>
99
<body>
1010

@@ -15,9 +15,9 @@
1515

1616

1717
<script src="assets/js/libs/jquery.min.js" type="text/javascript"></script>
18-
<script src="assets/js/libs/jquey.easing.js" type="text/javascript"></script>
18+
<script src="assets/js/libs/jquery.easing.js" type="text/javascript"></script>
1919
<script src="assets/js/interface.js" type="text/javascript"></script>
2020

21-
<script src="../assets/js/ticker.js" type="text/javascript"></script>
21+
<script src="../assets/js/tick.js" type="text/javascript"></script>
2222
</body>
2323
</html>

0 commit comments

Comments
 (0)