switching back to (better) icons

This commit is contained in:
Rolux 2010-03-06 10:54:30 +01:00
parent e7c0a60b50
commit 3abb6e31ea
6 changed files with 39 additions and 38 deletions

View File

@ -207,8 +207,7 @@ input[type=image].OxLarge {
input[type=image].OxLarge { input[type=image].OxLarge {
width: 18px; width: 18px;
} }
input[type=image].OxMedium, input[type=image].OxMedium {
.OxButton.OxSymbol.OxMedium {
width: 14px; width: 14px;
} }
input[type=image].OxSmall { input[type=image].OxSmall {
@ -329,12 +328,12 @@ div.OxInput > .OxInputLabel {
div.OxInput > .OxButton { div.OxInput > .OxButton {
float: left; float: left;
//margin-left: 1px; //margin-left: 1px;
margin-top: -2px; margin-top: -1px;
} }
div.OxInput > .OxButton:last-child { div.OxInput > .OxButton:last-child {
float: left; float: left;
margin-left: -1px; margin-left: -1px;
margin-top: -2px; margin-top: -1px;
} }
input.OxInput { input.OxInput {
float: left; float: left;
@ -399,9 +398,10 @@ OxSelect
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
*/ */
.OxSelect.OxMedium { .OxSelect.OxMedium {
margin-left: 0;
} }
.OxSelect > .OxButton { .OxSelect > .OxButton {
float: right;
text-align: left; text-align: left;
} }
.OxSelect > .OxSymbol { .OxSelect > .OxSymbol {
@ -411,7 +411,9 @@ OxSelect
-webkit-user-select: none; -webkit-user-select: none;
} }
.OxSelect.OxMedium > .OxSymbol { .OxSelect.OxMedium > .OxSymbol {
margin: -16px 0 0 8px; float: right;
margin: -16px 0 0 -4px;
z-index: 9;
} }
/* /*

View File

@ -1554,7 +1554,7 @@ requires
type: self.options.type == "text" ? "button" : "image" type: self.options.type == "text" ? "button" : "image"
}) })
.addClass("OxButton Ox" + Ox.toTitleCase(self.options.size) + .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.disabled ? " OxDisabled": "") +
(self.options.selected ? " OxSelected": "")) (self.options.selected ? " OxSelected": ""))
.mousedown(mousedown) .mousedown(mousedown)
@ -1772,9 +1772,9 @@ requires
that.$label && that.$label.click(select); that.$label && that.$label.click(select);
that.$select = new Ox.Button({ that.$select = new Ox.Button({
style: "symbol", style: "symbol",
// type: "image", type: "image",
// value: "select" value: "select"
value: oxui.symbols.select // value: oxui.symbols.select
}) })
.click(select) .click(select)
.appendTo(that); .appendTo(that);
@ -1818,9 +1818,9 @@ requires
if (self.options.clear) { if (self.options.clear) {
that.$clear = new Ox.Button({ that.$clear = new Ox.Button({
style: "symbol", style: "symbol",
//type: "image", type: "image",
//value: "clear" value: "clear"
value: oxui.symbols.clear //value: oxui.symbols.clear
}) })
.click(clear) .click(clear)
.appendTo(that); .appendTo(that);
@ -2058,20 +2058,20 @@ requires
Ox.Range Ox.Range
options: options:
animate boolean if true, animate thumb animate boolean if true, animate thumb
arrows boolean if true, show arrows arrows boolean if true, show arrows
arrowImages array arrow symbols, like ["minus", "plus"] arrowStep number step when clicking arrows
arrowStep number step when clicking arrows arrowSymbols array arrow symbols, like ["minus", "plus"]
max number maximum value max number maximum value
min number minimum value min number minimum value
orientation string "horizontal" or "vertical" orientation string "horizontal" or "vertical"
step number step between values step number step between values
size number width or height, in px size number width or height, in px
thumbSize number minimum width or height of thumb, in px thumbSize number minimum width or height of thumb, in px
thumbValue boolean if true, display value on thumb thumbValue boolean if true, display value on thumb
trackImages string or array one or multiple track background image URLs trackImages string or array one or multiple track background image URLs
trackStep number 0 (scroll here) or step when clicking track trackStep number 0 (scroll here) or step when clicking track
value number initial value value number initial value
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
*/ */
@ -2085,8 +2085,8 @@ requires
.defaults({ .defaults({
animate: false, animate: false,
arrows: false, arrows: false,
arrowImages: ["previous", "next"],
arrowStep: 1, arrowStep: 1,
arrowSymbols: ["previous", "next"],
max: 100, max: 100,
min: 0, min: 0,
orientation: "horizontal", orientation: "horizontal",
@ -2121,7 +2121,7 @@ requires
var $arrowDec = Ox.Button({ var $arrowDec = Ox.Button({
style: "symbol", style: "symbol",
type: "image", type: "image",
value: self.options.arrowImages[0] value: self.options.arrowSymbols[0]
}) })
.addClass("OxArrow") .addClass("OxArrow")
.mousedown(mousedownArrow) .mousedown(mousedownArrow)
@ -2162,7 +2162,7 @@ requires
var $arrowInc = Ox.Button({ var $arrowInc = Ox.Button({
style: "symbol", style: "symbol",
type: "image", type: "image",
value: self.options.arrowImages[1] value: self.options.arrowSymbols[1]
}) })
.addClass("OxArrow") .addClass("OxArrow")
.mousedown(mousedownArrow) .mousedown(mousedownArrow)
@ -2312,14 +2312,13 @@ requires
.click(clickButton) .click(clickButton)
.appendTo(that); .appendTo(that);
that.$symbol = $("<div>", { that.$symbol = new Ox.Button({
"class": "OxSymbol", style: "symbol",
html: oxui.symbols.select type: "image",
value: "select"
}) })
.click(function() { .click(clickButton)
that.$button.trigger("click"); .appendTo(that);
})
.appendTo(that.$element);
that.$menu = new Ox.Menu({ that.$menu = new Ox.Menu({
element: that.$button, element: that.$button,
@ -2355,7 +2354,7 @@ requires
// fixme: silly hack, and won't work for css() // fixme: silly hack, and won't work for css()
that.$element.width(val + 16); that.$element.width(val + 16);
that.$button.width(val); that.$button.width(val);
that.$symbol.width(val); //that.$symbol.width(val);
return that; return that;
}; };

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB