Skip to content

Commit 35d9f8b

Browse files
JacksonJacksonRG
Jackson
authored andcommitted
fixed webkit compatability
1 parent 590b10a commit 35d9f8b

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/timeline/js/directives/ruler.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,8 @@ App.directive("tlRuler", function ($timeout) {
170170
scale = scope.project.scale;
171171
for (var i = start - (start % 100) ; i < end; i += 100) {
172172
/* create and format span */
173-
s = $('<span>');
173+
s = $('<span style="left: ' + i + 'px;">');
174174
s.addClass("ruler_time");
175-
s[0].style = "left: " + i + "px;";
176175

177176
/* Calculate Time */
178177
var time = i / scope.pixelsPerSecond;

src/timeline/media/css/main.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ img {
5151
.drag_cursor { cursor: move; }
5252
#ruler {
5353
position: relative;
54-
height: 100%;
54+
height: 39px;
5555
background-image: url(../images/ruler-tick.svg);
5656
background-position: -50px;
5757
}
58-
.ruler_time{
59-
color: white;
60-
top: 5px;
61-
font-size: 0.9em;
58+
.ruler_time {
59+
color: #c8c8c8;
60+
top: 6px;
61+
font-size: 0.8em;
6262
position: absolute;
6363
transform: translate(-50%,0);
6464
}

0 commit comments

Comments
 (0)