From 73883cba1100daff8c71f6f2a60d86530ed16104 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Thu, 20 Oct 2011 12:59:36 +0000 Subject: [PATCH] update css --- build/Ox.UI/themes/classic/css/classic.css | 33 +++++++++++---- build/Ox.UI/themes/modern/css/modern.css | 40 +++++++++++++++---- .../Ox.UI/js/Video/Ox.BlockVideoTimeline.js | 1 + 3 files changed, 60 insertions(+), 14 deletions(-) diff --git a/build/Ox.UI/themes/classic/css/classic.css b/build/Ox.UI/themes/classic/css/classic.css index 8fdc9a49..155d6cb1 100644 --- a/build/Ox.UI/themes/classic/css/classic.css +++ b/build/Ox.UI/themes/classic/css/classic.css @@ -339,49 +339,68 @@ Lists ================================================================================ */ -.OxThemeClassic .OxIconList .OxItem img.OxLoading { +.OxThemeClassic .OxIconList .OxItem > .OxIcon > img.OxLoading, +.OxThemeClassic .OxInfoList .OxItem .OxIcon > img.OxLoading { border-color: rgb(208, 208, 208); background: -moz-linear-gradient(top, rgb(255, 255, 255), rgb(224, 224, 224)); background: -o-linear-gradient(top, rgb(255, 255, 255), rgb(224, 224, 224)); background: -webkit-linear-gradient(top, rgb(255, 255, 255), rgb(224, 224, 224)); } .OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > img, -.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer { +.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer, +.OxThemeClassic .OxInfoList .OxItem.OxSelected .OxIcon > img, +.OxThemeClassic .OxInfoList .OxItem.OxSelected .OxIcon > .OxVideoPlayer { border-color: rgb(192, 192, 192); -moz-box-shadow: 0 0 4px rgba(192, 192, 192, 1); -o-box-shadow: 0 0 4px rgba(192, 192, 192, 1); -webkit-box-shadow: 0 0 4px rgba(192, 192, 192, 1); } .OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img, -.OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > .OxVideoPlayer { +.OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > .OxVideoPlayer, +.OxThemeClassic .OxInfoList.OxFocus .OxItem.OxSelected .OxIcon > img, +.OxThemeClassic .OxInfoList.OxFocus .OxItem.OxSelected .OxIcon > .OxVideoPlayer { border-color: rgb(128, 128, 128); -moz-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -o-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1); } -.OxThemeClassic .OxIconList .OxItem > .OxText > div { +.OxThemeClassic .OxIconList .OxItem > .OxText > div, +.OxThemeClassic .OxInfoList .OxItem .OxText > div { text-shadow: rgb(255, 255, 255) -1px -1px 0, rgb(255, 255, 255) -1px 1px 0, rgb(255, 255, 255) 1px -1px 0, rgb(255, 255, 255) 1px 1px 0; } -.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxText > div { +.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxText > div, +.OxThemeClassic .OxInfoList .OxItem.OxSelected .OxText > div { border-color: rgb(192, 192, 192); background: rgba(192, 192, 192, 0.5); -moz-box-shadow: 0 0 4px rgba(192, 192, 192, 1); -o-box-shadow: 0 0 4px rgba(192, 192, 192, 1); -webkit-box-shadow: 0 0 4px rgba(192, 192, 192, 1); } -.OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div { +.OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div, +.OxThemeClassic .OxInfoList.OxFocus .OxItem.OxSelected .OxText > div { border-color: rgb(128, 128, 128); background: rgba(128, 128, 128, 0.5); -moz-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -moz-o-shadow: 0 0 4px rgba(128, 128, 128, 1); -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1); } -.OxThemeClassic .OxIconList .OxItem > .OxText > div > .OxInfo { +.OxThemeClassic .OxIconList .OxItem > .OxText > div > .OxInfo, +.OxThemeClassic .OxIconList .OxItem .OxText > div > .OxInfo { color: rgb(128, 128, 128); } +.OxThemeClassic .OxInfoList .OxItem.OxSelected .OxInfoElement .OxIcon > img, +.OxThemeClassic .OxInfoList .OxItem.OxSelected .OxInfoElement .OxIcon .OxVideoPlayer, +.OxThemeClassic .OxInfoList .OxItem.OxSelected .OxInfoElement .OxText > div { + border-color: rgba(0, 0, 0, 0); + background: rgba(0, 0, 0, 0); + -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); + -o-box-shadow: 0 0 0 rgba(0, 0, 0, 0); + -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); +} + .OxThemeClassic .OxTextList .OxContent { diff --git a/build/Ox.UI/themes/modern/css/modern.css b/build/Ox.UI/themes/modern/css/modern.css index 6bcd4784..343cfb74 100644 --- a/build/Ox.UI/themes/modern/css/modern.css +++ b/build/Ox.UI/themes/modern/css/modern.css @@ -1,3 +1,5 @@ +/* fixme: it wouldn't hurt if focus was blue */ + body.OxThemeModern { background: rgb(16, 16, 16); } @@ -326,49 +328,73 @@ Lists */ .OxThemeModern .OxIconList .OxItem > .OxIcon > img.OxLoading, -.OxThemeModern .OxInfoList .OxItem > .OxIcon > img.OxLoading { +.OxThemeModern .OxInfoList .OxItem .OxIcon > img.OxLoading { border-color: rgb(48, 48, 48); background: -moz-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0)); background: -o-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0)); background: -webkit-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0)); } .OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > img, -.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer { +.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIcon > img, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIcon > .OxVideoPlayer { border-color: rgb(64, 64, 64); -moz-box-shadow: 0 0 4px rgba(64, 64, 64, 1); -o-box-shadow: 0 0 4px rgba(64, 64, 64, 1); -webkit-box-shadow: 0 0 4px rgba(64, 64, 64, 1); } .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img, -.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon .OxVideoPlayer { +.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon .OxVideoPlayer, +.OxThemeModern .OxInfoList.OxFocus .OxItem.OxSelected .OxIcon > img, +.OxThemeModern .OxInfoList.OxFocus .OxItem.OxSelected .OxIcon .OxVideoPlayer { border-color: rgb(128, 128, 128); -moz-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -o-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1); } -.OxThemeModern .OxIconList .OxItem > .OxText > div { +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon > img, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon .OxVideoPlayer { + border-color: rgba(0, 0, 0, 0); + -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); + -o-box-shadow: 0 0 0 rgba(0, 0, 0, 0); + -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); +} +.OxThemeModern .OxIconList .OxItem > .OxText > div, +.OxThemeModern .OxInfoList .OxItem .OxText > div { text-shadow: rgb(0, 0, 0) -1px -1px 0, rgb(0, 0, 0) -1px 1px 0, rgb(0, 0, 0) 1px -1px 0, rgb(0, 0, 0) 1px 1px 0; } -.OxThemeModern .OxIconList .OxItem.OxSelected > .OxText > div { +.OxThemeModern .OxIconList .OxItem.OxSelected > .OxText > div, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxText > div { border-color: rgb(64, 64, 64); background: rgba(64, 64, 64, 0.5); -moz-box-shadow: 0 0 4px rgba(64, 64, 64, 1); -o-box-shadow: 0 0 4px rgba(64, 64, 64, 1); -webkit-box-shadow: 0 0 4px rgba(64, 64, 64, 1); } -.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div { +.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div, +.OxThemeModern .OxInfoList.OxFocus .OxItem.OxSelected .OxText > div { border-color: rgb(128, 128, 128); background: rgba(128, 128, 128, 0.5); -moz-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -o-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1); } -.OxThemeModern .OxIconList .OxItem > .OxText > div > .OxInfo { +.OxThemeModern .OxIconList .OxItem > .OxText > div > .OxInfo, +.OxThemeModern .OxInfoList .OxItem .OxText > div > .OxInfo { color: rgb(128, 128, 128); } +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxInfoElement .OxIcon > img, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxInfoElement .OxIcon .OxVideoPlayer, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxInfoElement .OxText > div { + border-color: rgba(0, 0, 0, 0); + background: rgba(0, 0, 0, 0); + -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); + -o-box-shadow: 0 0 0 rgba(0, 0, 0, 0); + -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); +} .OxThemeModern .OxTextList .OxContent { diff --git a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js index db0f620e..439d9d28 100644 --- a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js @@ -1,4 +1,5 @@ // vim: et:ts=4:sw=4:sts=4:ft=javascript + Ox.BlockVideoTimeline = function(options, self) { self = self || {};