diff --git a/source/Ox.UI/js/List/Ox.IconItem.js b/source/Ox.UI/js/List/Ox.IconItem.js index 4f7faf25..1e2c0b47 100644 --- a/source/Ox.UI/js/List/Ox.IconItem.js +++ b/source/Ox.UI/js/List/Ox.IconItem.js @@ -109,7 +109,10 @@ Ox.IconItem = function(options, self) { .mouseenter(mouseenter) .mouseleave(mouseleave); if (!self.infoIsObject) { - that.$text.html(self.title + '
' + self.info + '') + that.$text.html( + (self.title ? self.title + '
' : '') + + '' + self.info + '' + ); } else { that.$text.append(self.title).append(self.info); } diff --git a/source/Ox.UI/js/List/Ox.InfoList.js b/source/Ox.UI/js/List/Ox.InfoList.js index 1c75fe55..21e3abad 100644 --- a/source/Ox.UI/js/List/Ox.InfoList.js +++ b/source/Ox.UI/js/List/Ox.InfoList.js @@ -101,6 +101,7 @@ Ox.InfoList = function(options, self) { position: 'absolute', width: getItemWidth() - 144 + 'px', height: 196 + 'px', + marginTop: '-2px', overflow: 'hidden' }) .appendTo($info); @@ -200,6 +201,10 @@ Ox.InfoList = function(options, self) { return that; }; + that.updateInfo = function(id, options) { + // ... + } + that.value = function(id, key, value) { // fixme: make this accept id, {k: v, ...} if (arguments.length == 1) { diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css index 3ff3e0a9..01b839de 100644 --- a/source/Ox.UI/themes/modern/css/modern.css +++ b/source/Ox.UI/themes/modern/css/modern.css @@ -352,6 +352,13 @@ Lists -o-box-shadow: 0 0 4px rgba(128, 128, 128, 1); -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1); } +.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, @@ -379,6 +386,15 @@ Lists .OxThemeModern .OxInfoList .OxItem .OxText > div > .OxInfo { color: rgb(128, 128, 128); } +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon > img, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon .OxVideoPlayer, +.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .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 {