From 3abb6e31ea1a9c7f31a468728829bc6c7b1b5543 Mon Sep 17 00:00:00 2001 From: Rolux Date: Sat, 6 Mar 2010 10:54:30 +0100 Subject: [PATCH] switching back to (better) icons --- build/css/ox.ui.css | 14 +++-- build/js/ox.ui.js | 63 ++++++++++----------- build/png/ox.ui.classic/buttonClear.png | Bin 2928 -> 2925 bytes build/png/ox.ui.classic/buttonNext.png | Bin 2901 -> 2898 bytes build/png/ox.ui.classic/buttonPrevious.png | Bin 2901 -> 2896 bytes build/png/ox.ui.classic/buttonSelect.png | Bin 2905 -> 2915 bytes 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/build/css/ox.ui.css b/build/css/ox.ui.css index b26739e..d636aec 100644 --- a/build/css/ox.ui.css +++ b/build/css/ox.ui.css @@ -207,8 +207,7 @@ input[type=image].OxLarge { input[type=image].OxLarge { width: 18px; } -input[type=image].OxMedium, -.OxButton.OxSymbol.OxMedium { +input[type=image].OxMedium { width: 14px; } input[type=image].OxSmall { @@ -329,12 +328,12 @@ div.OxInput > .OxInputLabel { div.OxInput > .OxButton { float: left; //margin-left: 1px; - margin-top: -2px; + margin-top: -1px; } div.OxInput > .OxButton:last-child { float: left; margin-left: -1px; - margin-top: -2px; + margin-top: -1px; } input.OxInput { float: left; @@ -399,9 +398,10 @@ OxSelect -------------------------------------------------------------------------------- */ .OxSelect.OxMedium { - + margin-left: 0; } .OxSelect > .OxButton { + float: right; text-align: left; } .OxSelect > .OxSymbol { @@ -411,7 +411,9 @@ OxSelect -webkit-user-select: none; } .OxSelect.OxMedium > .OxSymbol { - margin: -16px 0 0 8px; + float: right; + margin: -16px 0 0 -4px; + z-index: 9; } /* diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js index 8721bc4..8909dba 100644 --- a/build/js/ox.ui.js +++ b/build/js/ox.ui.js @@ -1554,7 +1554,7 @@ requires type: self.options.type == "text" ? "button" : "image" }) .addClass("OxButton Ox" + Ox.toTitleCase(self.options.size) + - (self.options.style ? " Ox" + Ox.toTitleCase(self.options.style) : "") + + (self.options.style != "default" ? " Ox" + Ox.toTitleCase(self.options.style) : "") + (self.options.disabled ? " OxDisabled": "") + (self.options.selected ? " OxSelected": "")) .mousedown(mousedown) @@ -1772,9 +1772,9 @@ requires that.$label && that.$label.click(select); that.$select = new Ox.Button({ style: "symbol", - // type: "image", - // value: "select" - value: oxui.symbols.select + type: "image", + value: "select" + // value: oxui.symbols.select }) .click(select) .appendTo(that); @@ -1818,9 +1818,9 @@ requires if (self.options.clear) { that.$clear = new Ox.Button({ style: "symbol", - //type: "image", - //value: "clear" - value: oxui.symbols.clear + type: "image", + value: "clear" + //value: oxui.symbols.clear }) .click(clear) .appendTo(that); @@ -2058,20 +2058,20 @@ requires Ox.Range options: - animate boolean if true, animate thumb - arrows boolean if true, show arrows - arrowImages array arrow symbols, like ["minus", "plus"] - arrowStep number step when clicking arrows - max number maximum value - min number minimum value - orientation string "horizontal" or "vertical" - step number step between values - size number width or height, in px - thumbSize number minimum width or height of thumb, in px - thumbValue boolean if true, display value on thumb - trackImages string or array one or multiple track background image URLs - trackStep number 0 (scroll here) or step when clicking track - value number initial value + animate boolean if true, animate thumb + arrows boolean if true, show arrows + arrowStep number step when clicking arrows + arrowSymbols array arrow symbols, like ["minus", "plus"] + max number maximum value + min number minimum value + orientation string "horizontal" or "vertical" + step number step between values + size number width or height, in px + thumbSize number minimum width or height of thumb, in px + thumbValue boolean if true, display value on thumb + trackImages string or array one or multiple track background image URLs + trackStep number 0 (scroll here) or step when clicking track + value number initial value ---------------------------------------------------------------------------- */ @@ -2085,8 +2085,8 @@ requires .defaults({ animate: false, arrows: false, - arrowImages: ["previous", "next"], arrowStep: 1, + arrowSymbols: ["previous", "next"], max: 100, min: 0, orientation: "horizontal", @@ -2121,7 +2121,7 @@ requires var $arrowDec = Ox.Button({ style: "symbol", type: "image", - value: self.options.arrowImages[0] + value: self.options.arrowSymbols[0] }) .addClass("OxArrow") .mousedown(mousedownArrow) @@ -2162,7 +2162,7 @@ requires var $arrowInc = Ox.Button({ style: "symbol", type: "image", - value: self.options.arrowImages[1] + value: self.options.arrowSymbols[1] }) .addClass("OxArrow") .mousedown(mousedownArrow) @@ -2312,14 +2312,13 @@ requires .click(clickButton) .appendTo(that); - that.$symbol = $("
", { - "class": "OxSymbol", - html: oxui.symbols.select + that.$symbol = new Ox.Button({ + style: "symbol", + type: "image", + value: "select" }) - .click(function() { - that.$button.trigger("click"); - }) - .appendTo(that.$element); + .click(clickButton) + .appendTo(that); that.$menu = new Ox.Menu({ element: that.$button, @@ -2355,7 +2354,7 @@ requires // fixme: silly hack, and won't work for css() that.$element.width(val + 16); that.$button.width(val); - that.$symbol.width(val); + //that.$symbol.width(val); return that; }; diff --git a/build/png/ox.ui.classic/buttonClear.png b/build/png/ox.ui.classic/buttonClear.png index 620e25bdb934db9c191d4a6609571df92f468a42..fbee28dfedfbe56283876abb0081b75c34fc2548 100644 GIT binary patch delta 182 zcmV;n07?Jw7VQ?WzzTnuNkl}!dgedz#& zs!HbCBzd6{s04nW!2Tp?t%-=7F=6t(m%jJzPCy6y5Iu7RN20M2+Y! z7(vkHObsAN<0?W#nSWvsEzyQn1APl%RPFFUY)*6QuyTJ3?hGy|h$Y$(Mgx;R{g0>s k3ZMYe0S*8F0RR6309?jD6Ywd)ZrkrcF4z??ddFCs6W?2Ed?@4&J3A03y_gu7Vx} zEzaZsf^1w#h$!*jcEZ=oa8^K90ravR9*E`?pKVs|S@0xCL8LL4p*b#Bk7M&ca5z9< nl`=Se9Zyqf}H!bcoIn3$(62n&L}1YzL{n}V>3 z>#E#iQ~;>{08~=|RR*96AyNb5`+xxk{2m}bj&A?}0RR6306Y^OMgK&3QVswB002ov JPDHLkV1lI!JZ=C0 delta 158 zcmV;P0Ac^q7S$H8zzTnWNklV4ZU6uP|Nj;P0Q6EGMJrQQ_W%F@ M07*qoM6N<$f{*(+lmGw# diff --git a/build/png/ox.ui.classic/buttonPrevious.png b/build/png/ox.ui.classic/buttonPrevious.png index 258ab58ef0cf1f0214a1b494191d431f914e95a7..2576e84d0521a2742f774b11ab1c79f75248d001 100644 GIT binary patch delta 153 zcmV;K0A~Ny7SI;3zzTnRNkl(iH*00000NkvXX Hu0mjfTKqeo delta 158 zcmV;P0Ac^o7S$H8zzTnWNklNF$g+oEoI^(hC z7=Qs70672v0{AT#|5z-NJ7qK%Y`UaU?@C+&kPZ*;N*n>$Ixc$<%-pq*8uB>(^b M07*qoM6N<$f-2iRbN~PV diff --git a/build/png/ox.ui.classic/buttonSelect.png b/build/png/ox.ui.classic/buttonSelect.png index 28ef8b22794279466db6840d0a5d70b1d7a7c54b..82ccb77cf80e82f0fdb96496c9d9bd893622cc0e 100644 GIT binary patch delta 172 zcmV;d08{_j7ULGMzzTnkNkl7-QwSdl*knGm~b3i}NQX;O3o#0G+-N0t~{q2vC9Tg5a;-ptfO+ z;>}U)5{j82Dg$uDM|26Gz;?l}pcWw_OXckX1nK0c4RIR$7o#M&c0mzHCy*|}2><~9 a{{sMe+aoaryg=>%0000xJwC$J->^gxm8jycmeKL%yDnMBB@U7jCs|i<1AcQ4oB$dC0RR6302URP$xRU^ Q7ytkO07*qoM6N<$f