diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css index 5da5cfe6..12e2addf 100644 --- a/source/Ox.UI/css/Ox.UI.css +++ b/source/Ox.UI/css/Ox.UI.css @@ -1012,7 +1012,7 @@ Lists .OxIconList .OxItem { float: left; - margin: 4px; + margin: 2px; opacity: 0.9; } .OxIconList .OxItem.OxHover, diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js index 2c1072c4..22a50614 100644 --- a/source/Ox.UI/js/Form/Ox.Filter.js +++ b/source/Ox.UI/js/Form/Ox.Filter.js @@ -69,8 +69,8 @@ Ox.Filter = function(options, self) { {id: '!<', title: 'is not less than'}, {id: '>', title: 'is greater than'}, {id: '!>', title: 'is not greater than'}, - {id: '=:', title: 'is between'}, - {id: '!=:', title: 'is not between'}/*, + {id: '-', title: 'is between'}, + {id: '!-', title: 'is not between'}/*, {id: '^', title: 'starts with'}, {id: '!^', title: 'does not start with'}, {id: '$', title: 'ends with'}, @@ -339,6 +339,7 @@ Ox.Filter = function(options, self) { var condition = subpos == -1 ? self.options.query.conditions[pos] : self.options.query.conditions[pos].conditions[subpos]; + // fixme: change to number if needed condition.value = value; triggerChangeEvent(); } diff --git a/source/Ox.UI/js/List/Ox.IconItem.js b/source/Ox.UI/js/List/Ox.IconItem.js index 453f9393..b790b5cc 100644 --- a/source/Ox.UI/js/List/Ox.IconItem.js +++ b/source/Ox.UI/js/List/Ox.IconItem.js @@ -64,8 +64,9 @@ Ox.IconItem = function(options, self) { } that.css({ - width: self.options.itemWidth + 'px', - height: self.options.itemHeight + 'px' + // 2 * 2 px margin (.css), 2 * 2 px border (here) + width: self.options.itemWidth + 4 + 'px', + height: self.options.itemHeight + + 4 + 'px' }); that.$icon = $('