0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

add 'squared' (less rounded) style

Browse source
This commit is contained in:
rolux 2014-05-06 00:13:25 +02:00
parent edc80d8bbc
commit b7cf611b4a
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/Ox.UI/css/Ox.UI.css
View file

@ -682,6 +682,9 @@ input.OxMedium.OxRounded {
padding: 0 6px 0 6px; padding: 0 6px 0 6px;
border-radius: 8px; border-radius: 8px;
} }
input.OxMedium.OxSquared {
border-radius: 4px;
}
input.OxMedium.OxSquare { input.OxMedium.OxSquare {
padding: 0 2px 0 2px; padding: 0 2px 0 2px;
border-radius: 0; border-radius: 0;
@ -712,6 +715,9 @@ textarea {
border-radius: 8px; border-radius: 8px;
resize: none; resize: none;
} }
textarea.OxSquared {
border-radius: 4px;
}
textarea.OxSquare { textarea.OxSquare {
border-radius: 0; border-radius: 0;
} }
@ -819,6 +825,14 @@ OxButtonGroup
.OxButtonGroup > .OxButton.OxTab:last-child { .OxButtonGroup > .OxButton.OxTab:last-child {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.OxButtonGroup.OxSquared > .OxButton.OxMedium:first-child {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
.OxButtonGroup.OxSquared > .OxButton.OxMedium:last-child {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
/* /*
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
OxCheckbox OxCheckbox
@ -924,6 +938,9 @@ div.OxInput.OxMedium {
div.OxInput.OxRounded { div.OxInput.OxRounded {
border-radius: 8px; border-radius: 8px;
} }
div.OxInput.OxSquared {
border-radius: 4px;
}
div.OxInput.OxSquare { div.OxInput.OxSquare {
border-radius: 0; border-radius: 0;
} }
@ -1018,6 +1035,9 @@ OxLabel
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
.OxLabel.OxSquared {
border-radius: 4px;
}
.OxLabel.OxSquare { .OxLabel.OxSquare {
padding: 0 3px 0 3px; padding: 0 3px 0 3px;
border-radius: 0; border-radius: 0;
@ -1151,6 +1171,12 @@ OxSelect
.OxSelect.OxRounded.OxSelected { .OxSelect.OxRounded.OxSelected {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
} }
.OxSelect.OxSquared {
border-radius: 4px;
}
.OxSelect.OxSquared.OxSelected {
border-radius: 4px 4px 0 0;
}
.OxSelect.OxSquare { .OxSelect.OxSquare {
border-radius: 0; border-radius: 0;
} }

2
source/Ox.UI/js/Form/ButtonGroup.js
View file

@ -86,7 +86,7 @@ Ox.ButtonGroup = function(options, self) {
overlap: button.overlap, overlap: button.overlap,
selectable: self.options.selectable, selectable: self.options.selectable,
size: self.options.size, size: self.options.size,
style: self.options.style, style: self.options.style == 'squared' ? 'default' : self.options.style, // FIXME: ugly
title: button.title, title: button.title,
tooltip: button.tooltip, tooltip: button.tooltip,
type: self.options.type, type: self.options.type,