diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css index 36f1ad85..6d1a15cc 100644 --- a/source/Ox.UI/css/Ox.UI.css +++ b/source/Ox.UI/css/Ox.UI.css @@ -2613,6 +2613,13 @@ Video .OxVideoTimelinePlayer .OxSelect > .OxButton { 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); +} diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css index 5736d690..73947edc 100644 --- a/source/Ox.UI/css/theme.css +++ b/source/Ox.UI/css/theme.css @@ -1054,6 +1054,10 @@ Video background-image: -webkit-linear-gradient(top, $videoButtonActiveGradient); } +.$themeClass .OxVideoTimelinePlayer .OxVideoBox { + border-color: $bodyColor; +} + /* FIXME: the first three should apply for every ArrayEditable */ .$themeClass .OxAnnotationFolder .OxArrayEditable .OxSeparator { color: $videoAnnotationSeparatorColor; diff --git a/source/Ox.UI/js/Video/VideoTimelinePlayer.js b/source/Ox.UI/js/Video/VideoTimelinePlayer.js index 0a07ff89..696e2d78 100644 --- a/source/Ox.UI/js/Video/VideoTimelinePlayer.js +++ b/source/Ox.UI/js/Video/VideoTimelinePlayer.js @@ -294,15 +294,13 @@ Ox.VideoTimelinePlayer = function(options, self) { }); self.$frameBox = $('
') + .addClass('OxVideoBox') .css({ position: 'absolute', right: 0, top: self.margin / 2 - 1 + 'px', width: self.videoWidth + 'px', - height: self.tileHeight + 'px', - borderTop: '1px solid rgb(128, 128, 128)', - borderBottom: '1px solid rgb(128, 128, 128)', - background: 'rgb(0, 0, 0)' + height: self.tileHeight + 'px' }) .appendTo(self.$timelines[self.videoLines[1]][0]); @@ -337,15 +335,13 @@ Ox.VideoTimelinePlayer = function(options, self) { .appendTo(self.$frameBox); self.$videoBox = $('
') + .addClass('OxVideoBox') .css({ position: 'absolute', right: 0, top: self.margin / 2 - 1 + 'px', width: self.videoWidth + '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 }) .appendTo(self.$timelines[self.videoLines[0]][0]);