From ab6c1f2234f7d2fb6b8db64761aa188127f82769 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Fri, 17 Feb 2012 22:08:02 +0000 Subject: [PATCH] change color scheme for editable annotations (fixes #502) --- source/Ox.UI/js/Form/Ox.Editable.js | 2 +- source/Ox.UI/themes/classic/css/classic.css | 4 ++-- source/Ox.UI/themes/modern/css/modern.css | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/Ox.UI/js/Form/Ox.Editable.js b/source/Ox.UI/js/Form/Ox.Editable.js index 0607adf1..6858d36a 100644 --- a/source/Ox.UI/js/Form/Ox.Editable.js +++ b/source/Ox.UI/js/Form/Ox.Editable.js @@ -35,7 +35,7 @@ Ox.Editable = function(options, self) { type: 'input' }) .options(options || {}) - .addClass('OxEditableElement') + .addClass('OxEditableElement' + (self.options.editable ? ' OxEditable' : '')) .bind({ click: function() { return false; diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css index c9a64a1a..990f3d7e 100644 --- a/source/Ox.UI/themes/classic/css/classic.css +++ b/source/Ox.UI/themes/classic/css/classic.css @@ -788,7 +788,7 @@ Video .OxThemeClassic .OxAnnotationFolder .OxEditableElement.OxWarning .OxValue { border-bottom: 2px dotted rgb(255, 64, 64); } -.OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected { +.OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected { background: rgb(192, 192, 255); } .OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected .OxHighlight { @@ -816,7 +816,7 @@ Video .OxThemeClassic .OxAnnotationFolder .OxArrayEditableInput .OxEditableElement.OxSelected { box-shadow: 0 0 1px rgb(64, 64, 64); } -.OxThemeClassic .OxAnnotationFolder .OxArrayEditableTextarea .OxEditableElement.OxEditing { +.OxThemeClassic .OxAnnotationFolder .OxArrayEditableTextarea .OxEditableElement.OxEditable.OxEditing { background: rgb(160, 224, 160); } .OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxInput.OxFocus { diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css index 53e46dc7..11cf0620 100644 --- a/source/Ox.UI/themes/modern/css/modern.css +++ b/source/Ox.UI/themes/modern/css/modern.css @@ -799,13 +799,13 @@ Video .OxThemeModern .OxAnnotationFolder .OxEditableElement.OxWarning .OxValue { border-bottom: 2px dotted rgb(192, 0, 0); } -.OxThemeModern .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected { +.OxThemeModern .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected { background: rgb(64, 64, 192); } .OxThemeModern .OxAnnotationFolder .OxArrayEditableInput .OxEditableElement.OxSelected { box-shadow: 0 0 1px rgb(255, 255, 255); } -.OxThemeModern .OxAnnotationFolder .OxArrayEditableTextarea .OxEditableElement.OxEditing { +.OxThemeModern .OxAnnotationFolder .OxArrayEditableTextarea .OxEditableElement.OxEditable.OxEditing { background: rgb(64, 128, 64); } .OxThemeModern .OxAnnotationFolder .OxArrayEditable .OxInput.OxFocus { @@ -814,7 +814,6 @@ Video .OxThemeModern .OxAnnotationFolder .OxEditableElement input { background: rgb(64, 128, 64); color: rgb(255, 255, 255); - //box-shadow: 0 0 1px rgb(64, 64, 64); } .OxThemeModern .OxAnnotationFolder .OxEditableElement textarea { background: rgb(64, 128, 64);