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

change color scheme for editable annotations (fixes #502)

Browse source
This commit is contained in:
rlx 2012-02-17 22:08:02 +00:00
parent c6e8a84f65
commit ab6c1f2234
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/Form/Ox.Editable.js
View file

@ -35,7 +35,7 @@ Ox.Editable = function(options, self) {
type: 'input' type: 'input'
}) })
.options(options || {}) .options(options || {})
.addClass('OxEditableElement') .addClass('OxEditableElement' + (self.options.editable ? ' OxEditable' : ''))
.bind({ .bind({
click: function() { click: function() {
return false; return false;

4
source/Ox.UI/themes/classic/css/classic.css
View file

@ -788,7 +788,7 @@ Video
.OxThemeClassic .OxAnnotationFolder .OxEditableElement.OxWarning .OxValue { .OxThemeClassic .OxAnnotationFolder .OxEditableElement.OxWarning .OxValue {
border-bottom: 2px dotted rgb(255, 64, 64); border-bottom: 2px dotted rgb(255, 64, 64);
} }
.OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected { .OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected {
background: rgb(192, 192, 255); background: rgb(192, 192, 255);
} }
.OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected .OxHighlight { .OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected .OxHighlight {
@ -816,7 +816,7 @@ Video
.OxThemeClassic .OxAnnotationFolder .OxArrayEditableInput .OxEditableElement.OxSelected { .OxThemeClassic .OxAnnotationFolder .OxArrayEditableInput .OxEditableElement.OxSelected {
box-shadow: 0 0 1px rgb(64, 64, 64); 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); background: rgb(160, 224, 160);
} }
.OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxInput.OxFocus { .OxThemeClassic .OxAnnotationFolder .OxArrayEditable .OxInput.OxFocus {

5
source/Ox.UI/themes/modern/css/modern.css
View file

@ -799,13 +799,13 @@ Video
.OxThemeModern .OxAnnotationFolder .OxEditableElement.OxWarning .OxValue { .OxThemeModern .OxAnnotationFolder .OxEditableElement.OxWarning .OxValue {
border-bottom: 2px dotted rgb(192, 0, 0); border-bottom: 2px dotted rgb(192, 0, 0);
} }
.OxThemeModern .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected { .OxThemeModern .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected {
background: rgb(64, 64, 192); background: rgb(64, 64, 192);
} }
.OxThemeModern .OxAnnotationFolder .OxArrayEditableInput .OxEditableElement.OxSelected { .OxThemeModern .OxAnnotationFolder .OxArrayEditableInput .OxEditableElement.OxSelected {
box-shadow: 0 0 1px rgb(255, 255, 255); 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); background: rgb(64, 128, 64);
} }
.OxThemeModern .OxAnnotationFolder .OxArrayEditable .OxInput.OxFocus { .OxThemeModern .OxAnnotationFolder .OxArrayEditable .OxInput.OxFocus {
@ -814,7 +814,6 @@ Video
.OxThemeModern .OxAnnotationFolder .OxEditableElement input { .OxThemeModern .OxAnnotationFolder .OxEditableElement input {
background: rgb(64, 128, 64); background: rgb(64, 128, 64);
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
//box-shadow: 0 0 1px rgb(64, 64, 64);
} }
.OxThemeModern .OxAnnotationFolder .OxEditableElement textarea { .OxThemeModern .OxAnnotationFolder .OxEditableElement textarea {
background: rgb(64, 128, 64); background: rgb(64, 128, 64);