diff --git a/build/css/ox.ui.classic.css b/build/css/ox.ui.classic.css
index 4ab764a4..8b53fffd 100644
--- a/build/css/ox.ui.classic.css
+++ b/build/css/ox.ui.classic.css
@@ -69,6 +69,7 @@ Forms
.OxThemeClassic .OxButton,
.OxThemeClassic input.OxCheckbox,
.OxThemeClassic input.OxInput,
+.OxThemeClassic textarea,
.OxThemeClassic .OxLabel,
.OxThemeClassic .OxTrack {
border: 1px solid rgb(176, 176, 176);
@@ -162,7 +163,9 @@ Forms
background: rgb(224, 224, 224);
}
-
+.OxThemeClassic textarea {
+ background: rgb(240, 240, 240);
+}
/*
================================================================================
@@ -204,7 +207,7 @@ Lists
-moz-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 {
+.OxThemeClassic .OxIconList .OxItem > .OxText > div > .OxInfo {
color: rgb(128, 128, 128);
}
diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index 607943cc..009267f1 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -177,7 +177,6 @@ requires
}
function loadImages(callback) {
- window.OxImageCache = [];
$.getJSON(oxui.path + 'json/ox.ui.images.json', function(data) {
var counter = 0,
length = data.length;
@@ -187,7 +186,6 @@ requires
image.onload = function() {
(++counter == length) && callback();
}
- window.OxImageCache.push(image);
});
});
}
@@ -2993,7 +2991,7 @@ requires
width: self.inputWidth + 'px',
textAlign: self.options.textAlign
}, self.options.type == 'textarea' ? {
- height: self.options.height + 'px'
+ height: self.options.height + 'px',
} : {}))
.val(self.options.value)
.blur(blur)
@@ -3001,6 +2999,34 @@ requires
.focus(focus)
.appendTo(that.$element);
+ // fixme: is there a better way than this one?
+ if (self.options.type == 'textarea') {
+ $.extend(self, {
+ colors: Ox.theme() == 'classic' ?
+ [208, 232, 244] :
+ [0, 16, 32],
+ colorstops: [8 / self.options.height, self.options.height - 8 / self.options.height]
+ });
+ self.$input.css({
+ background: '-moz-linear-gradient(top, rgb(' +
+ [self.colors[0], self.colors[0], self.colors[0]].join(', ') + '), rgb(' +
+ [self.colors[1], self.colors[1], self.colors[1]].join(', ') + ') ' +
+ Math.round(self.colorstops[0] * 100) + '%, rgb(' +
+ [self.colors[1], self.colors[1], self.colors[1]].join(', ') + ') ' +
+ Math.round(self.colorstops[1] * 100) + '%, rgb(' +
+ [self.colors[2], self.colors[2], self.colors[2]].join(', ') + '))'
+ });
+ self.$input.css({
+ background: '-webkit-gradient(linear, left top, left bottom, from(rgb(' +
+ [self.colors[0], self.colors[0], self.colors[0]].join(', ') + ')), color-stop(' +
+ self.colorstops[0] + ', ' + 'rgb(' +
+ [self.colors[1], self.colors[1], self.colors[1]].join(', ') + ')), color-stop( ' +
+ self.colorstops[1] + ', ' + 'rgb(' +
+ [self.colors[1], self.colors[1], self.colors[1]].join(', ') + ')), to(rgb(' +
+ [self.colors[2], self.colors[2], self.colors[2]].join(', ') + ')))'
+ });
+ }
+
if (self.hasPasswordPlaceholder) {
self.$input.hide();
self.$placeholder = $('')
@@ -10692,103 +10718,6 @@ requires
};
- Ox.Flipbook = function(options, self) {
-
- var self = self || {},
- frame = $('').css({
- 'position': 'absolute',
- 'width': '100%',
- 'height': 'auto'
- })
- .hide(),
- icon = $('
').css({
- 'position': 'absolute',
- 'width': '100%',
- 'height': 'auto'
- }),
- frames = {},
- timestamp = $('