0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

make border of video box in video timeline player themed

Browse source
This commit is contained in:
rolux 2013-02-21 12:29:45 +05:30
parent 51881d98b9
commit d98cf99714
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/Ox.UI/css/Ox.UI.css
View file

@ -2613,6 +2613,13 @@ Video
.OxVideoTimelinePlayer .OxSelect > .OxButton { .OxVideoTimelinePlayer .OxSelect > .OxButton {
margin: 0; margin: 0;
} }
.OxVideoTimelinePlayer .OxVideoBox {
border-top-width: 1px;
border-top-style: solid;
border-bottom-width: 1px;
border-bottom-style: solid;
background: rgb(0, 0, 0);
}

4
source/Ox.UI/css/theme.css
View file

@ -1054,6 +1054,10 @@ Video
background-image: -webkit-linear-gradient(top, $videoButtonActiveGradient); background-image: -webkit-linear-gradient(top, $videoButtonActiveGradient);
} }
.$themeClass .OxVideoTimelinePlayer .OxVideoBox {
border-color: $bodyColor;
}
/* FIXME: the first three should apply for every ArrayEditable */ /* FIXME: the first three should apply for every ArrayEditable */
.$themeClass .OxAnnotationFolder .OxArrayEditable .OxSeparator { .$themeClass .OxAnnotationFolder .OxArrayEditable .OxSeparator {
color: $videoAnnotationSeparatorColor; color: $videoAnnotationSeparatorColor;

10
source/Ox.UI/js/Video/VideoTimelinePlayer.js
View file

@ -294,15 +294,13 @@ Ox.VideoTimelinePlayer = function(options, self) {
}); });
self.$frameBox = $('<div>') self.$frameBox = $('<div>')
.addClass('OxVideoBox')
.css({ .css({
position: 'absolute', position: 'absolute',
right: 0, right: 0,
top: self.margin / 2 - 1 + 'px', top: self.margin / 2 - 1 + 'px',
width: self.videoWidth + 'px', width: self.videoWidth + 'px',
height: self.tileHeight + 'px', height: self.tileHeight + 'px'
borderTop: '1px solid rgb(128, 128, 128)',
borderBottom: '1px solid rgb(128, 128, 128)',
background: 'rgb(0, 0, 0)'
}) })
.appendTo(self.$timelines[self.videoLines[1]][0]); .appendTo(self.$timelines[self.videoLines[1]][0]);
@ -337,15 +335,13 @@ Ox.VideoTimelinePlayer = function(options, self) {
.appendTo(self.$frameBox); .appendTo(self.$frameBox);
self.$videoBox = $('<div>') self.$videoBox = $('<div>')
.addClass('OxVideoBox')
.css({ .css({
position: 'absolute', position: 'absolute',
right: 0, right: 0,
top: self.margin / 2 - 1 + 'px', top: self.margin / 2 - 1 + 'px',
width: self.videoWidth + 'px', width: self.videoWidth + 'px',
height: self.tileHeight + 'px', height: self.tileHeight + 'px',
borderTop: '1px solid rgb(128, 128, 128)',
borderBottom: '1px solid rgb(128, 128, 128)',
background: 'rgb(0, 0, 0)',
zIndex: 5 zIndex: 5
}) })
.appendTo(self.$timelines[self.videoLines[0]][0]); .appendTo(self.$timelines[self.videoLines[0]][0]);