From e2c2eeed437590a316f0530638b174dc891fd4be Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Fri, 4 Nov 2011 15:13:51 +0000 Subject: [PATCH] update video form element css --- source/Ox.UI/js/Core/Ox.URL.js | 4 +-- source/Ox.UI/js/Video/Ox.VideoEditor.js | 2 +- source/Ox.UI/themes/classic/css/classic.css | 29 ++++++++++++--------- source/Ox.UI/themes/modern/css/modern.css | 20 +++++++++----- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/source/Ox.UI/js/Core/Ox.URL.js b/source/Ox.UI/js/Core/Ox.URL.js index dffa61fb..23253fb6 100644 --- a/source/Ox.UI/js/Core/Ox.URL.js +++ b/source/Ox.UI/js/Core/Ox.URL.js @@ -85,8 +85,8 @@ kv k v > is more than (number) k!>v k v !> is not more than (number) -k=v:w k [v,w] - is between (number), is (string) -k!=v:w k [v,w] !- is not between (number), is not (string) +k=v:w k [v,w] = is between (number), contains (string or text) +k!=v:w k [v,w] != is not between (number), does not contain (string or text) All parts of the URL can be omitted, as long as the order is preserved. diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index eab85103..b562e1be 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -531,7 +531,7 @@ Ox.VideoEditor = function(options, self) { } }) .appendTo(self.$videobar); - self.$findInput.find('input').css({background: 'rgb(48, 48, 48)'}); + //self.$findInput.find('input').css({background: 'rgb(48, 48, 48)'}); self.$findButton = Ox.Button({ //disabled: true, diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css index 1761d904..e9e0ddd3 100644 --- a/source/Ox.UI/themes/classic/css/classic.css +++ b/source/Ox.UI/themes/classic/css/classic.css @@ -674,9 +674,14 @@ Video background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); } .OxThemeClassic .OxVideoPlayer input.OxInput { - background-image: -moz-linear-gradient(top, rgba(176, 176, 176, 1), rgba(224, 224, 224, 1)); - background-image: -o-linear-gradient(top, rgba(176, 176, 176, 1), rgba(224, 224, 224, 1)); - background-image: -webkit-linear-gradient(top, rgba(176, 176, 176, 1), rgba(224, 224, 224, 1)); + background-image: -moz-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(224, 224, 224, 0.75)); + background-image: -o-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(224, 224, 224, 0.75)); + background-image: -webkit-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(224, 224, 224, 0.75)); +} +.OxThemeClassic .OxVideoPlayer .OxFind input.OxInput { + background-image: -moz-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(255, 255, 255, 0.75)); + background-image: -o-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(255, 255, 255, 0.75)); + background-image: -webkit-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(255, 255, 255, 0.75)); } .OxThemeClassic .OxVideoPlayer .OxResolution > div { background: rgba(224, 224, 224, 0.5); @@ -692,19 +697,19 @@ Video background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); } .OxThemeClassic .OxVideoPlayer .OxVolume .OxRange .OxTrack { - background-image: -moz-linear-gradient(top, rgba(192, 192, 192, 0.5), rgba(255, 255, 255, 0.5)); - background-image: -o-linear-gradient(top, rgba(192, 192, 192, 0.5), rgba(255, 255, 255, 0.5)); - background-image: -webkit-linear-gradient(top, rgba(192, 192, 192, 0.5), rgba(255, 255, 255, 0.5)); + background-image: -moz-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(255, 255, 255, 0.75)); + background-image: -o-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(255, 255, 255, 0.75)); + background-image: -webkit-linear-gradient(top, rgba(192, 192, 192, 0.75), rgba(255, 255, 255, 0.75)); } .OxThemeClassic .OxVideoPlayer .OxVolume .OxRange .OxThumb { - background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); - background-image: -o-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); - background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.75), rgba(192, 192, 192, 0.75)); + background-image: -o-linear-gradient(top, rgba(255, 255, 255, 0.75), rgba(192, 192, 192, 0.75)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.75), rgba(192, 192, 192, 0.75)); } .OxThemeClassic .OxVideoPlayer .OxVolume .OxRange .OxThumb:active { - background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); - background-image: -o-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); - background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 1), rgba(192, 192, 192, 1)); + background-image: -o-linear-gradient(top, rgba(255, 255, 255, 1), rgba(192, 192, 192, 1)); + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 1), rgba(192, 192, 192, 1)); } /* diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css index ede118ce..e2dc8f9f 100644 --- a/source/Ox.UI/themes/modern/css/modern.css +++ b/source/Ox.UI/themes/modern/css/modern.css @@ -669,10 +669,18 @@ Video background-image: -o-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); background-image: -webkit-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); } +.OxThemeModern .OxVideoPlayer div.OxInput { + background: transparent; +} .OxThemeModern .OxVideoPlayer input.OxInput { - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(64, 64, 64, 0.5)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(64, 64, 64, 0.5)); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 1), rgba(32, 32, 32, 1)); + background-image: -moz-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(64, 64, 64, 0.75)); + background-image: -o-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(64, 64, 64, 0.75)); + background-image: -webkit-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(64, 64, 64, 0.75)); +} +.OxThemeModern .OxVideoPlayer .OxFind input.OxInput { + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.75), rgba(64, 64, 64, 0.75)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.75), rgba(64, 64, 64, 0.75)); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.75), rgba(64, 64, 64, 0.75)); } .OxThemeModern .OxVideoPlayer .OxResolution > div { background: rgba(32, 32, 32, 0.5); @@ -690,17 +698,17 @@ Video .OxThemeModern .OxVideoPlayer .OxVolume .OxRange .OxTrack { background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(64, 64, 64, 0.5)); background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(64, 64, 64, 0.5)); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(64, 64, 64, 0.5)); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.75), rgba(64, 64, 64, 0.75)); } .OxThemeModern .OxVideoPlayer .OxVolume .OxRange .OxThumb { background-image: -moz-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); background-image: -o-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); - background-image: -webkit-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); + background-image: -webkit-linear-gradient(top, rgba(64, 64, 64, 0.75), rgba(0, 0, 0, 0.75)); } .OxThemeModern .OxVideoPlayer .OxVolume .OxRange .OxThumb:active { background-image: -moz-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); background-image: -o-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); - background-image: -webkit-linear-gradient(top, rgba(64, 64, 64, 0.5), rgba(0, 0, 0, 0.5)); + background-image: -webkit-linear-gradient(top, rgba(64, 64, 64, 1), rgba(0, 0, 0, 1)); }