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

merging changes

Browse source
This commit is contained in:
rolux 2010-09-03 10:47:40 +02:00
commit 9842418f0d
111 changed files with 5275 additions and 930 deletions
Download patch file Download diff file Expand all files Collapse all files

71
build/css/ox.ui.classic.css
View file

@ -58,60 +58,82 @@ Forms
*/
.OxThemeClassic .OxButton,
.OxThemeClassic .OxInput,
.OxThemeClassic input.OxCheckbox,
.OxThemeClassic input.OxInput,
.OxThemeClassic .OxLabel,
.OxThemeClassic .OxRange,
.OxThemeClassic .OxTrack {
border: 1px solid rgb(176, 176, 176);
//border: 1px solid rgb(160, 160, 160);
color: rgb(64, 64, 64);
}
.OxThemeClassic .OxSelect {
border: 1px solid rgb(176, 176, 176);
}
.OxThemeClassic .OxSelect > .OxTitle {
color: rgb(64, 64, 64);
}
.OxThemeClassic .OxInputLabel {
color: rgb(64, 64, 64);
}
.OxThemeClassic .OxButton,
.OxThemeClassic div.OxInput,
.OxThemeClassic .OxRange {
.OxThemeClassic .OxSelect {
//background: -moz-linear-gradient(left top, left bottom, from(rgb(192, 192, 192)), to(rgb(160, 160, 160)));
//background: -webkit-gradient(linear, left top, left bottom, from(rgb(192, 192, 192)), to(rgb(160, 160, 160)));
background: -moz-linear-gradient(top, rgb(224, 224, 224), rgb(192, 192, 192));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(224, 224, 224)), to(rgb(192, 192, 192)));
}
.OxThemeClassic .OxButton:focus {
-moz-box-shadow: 0 0 2px rgb(128, 128, 128);
-webkit-box-shadow: 0 2 4px rgb(128, 128, 128);
}
.OxThemeClassic .OxButton:active,
.OxThemeClassic .OxRange.OxActive {
.OxThemeClassic .OxButton:active {
//background: rgb(160, 160, 160);
background: rgb(192, 192, 192);
color: rgb(48, 48, 48);
}
.OxThemeClassic .OxButton.OxDisabled {
background: rgb(192, 192, 192);
color: rgb(128, 128, 128);
.OxThemeClassic .OxCheckbox:active {
background: -moz-linear-gradient(top, rgb(192, 192, 192), rgb(240, 240, 240));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(192, 192, 192)), to(rgb(240, 240, 240)));
}
.OxThemeClassic .OxButton.OxSelected {
//background: -moz-linear-gradient(left top, left bottom, from(rgb(128, 128, 128)), to(rgb(160, 160, 160)));
//background: -webkit-gradient(linear, left top, left bottom, from(rgb(128, 128, 128)), to(rgb(160, 160, 160)));
background: -moz-linear-gradient(top, rgb(128, 128, 128), rgb(160, 160, 160) 10%, rgb(192, 192, 192));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(128, 128, 128)), color-stop(0.1, rgb(160, 160, 160)), to(rgb(192, 192, 192)));
.OxThemeClassic .OxButton:focus {
-moz-box-shadow: 0 0 2px rgb(128, 128, 128);
-webkit-box-shadow: 0 2 4px rgb(128, 128, 128);
}
.OxThemeClassic .OxButton.OxSelected,
.OxThemeClassic .OxSelect.OxSelected {
background: -moz-linear-gradient(top, rgb(128, 128, 128), rgb(160, 160, 160));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(160, 160, 160)), to(rgb(192, 192, 192)));
//background: -moz-linear-gradient(top, rgb(128, 128, 128), rgb(160, 160, 160) 10%, rgb(192, 192, 192));
//background: -webkit-gradient(linear, left top, left bottom, from(rgb(128, 128, 128)), color-stop(0.1, rgb(160, 160, 160)), to(rgb(192, 192, 192)));
color: rgb(32, 32, 32);
}
.OxThemeClassic .OxButton.OxTab.OxSelected {
border-bottom: 1px solid rgb(192, 192, 192);
}
.OxThemeClassic .OxButton.OxDisabled,
.OxThemeClassic .OxLabel.OxDisabled {
color: rgb(128, 128, 128);
}
.OxThemeClassic .OxButton.OxDisabled {
background: rgb(192, 192, 192);
}
.OxThemeClassic input.OxCheckbox,
.OxThemeClassic input.OxInput,
.OxThemeClassic .OxTrack {
background: -moz-linear-gradient(top, rgb(224, 224, 224), rgb(255, 255, 255));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(224, 224, 224)), to(rgb(255, 255, 255)));
//background: -moz-linear-gradient(top, rgb(224, 224, 224), rgb(255, 255, 255));
//background: -webkit-gradient(linear, left top, left bottom, from(rgb(224, 224, 224)), to(rgb(255, 255, 255)));
background: -moz-linear-gradient(top, rgb(208, 208, 208), rgb(255, 255, 255));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(208, 208, 208)), to(rgb(255, 255, 255)));
}
.OxThemeClassic .OxInput:focus {
border: 1px solid rgb(160, 160, 160);
//border: 1px solid rgb(160, 160, 160);
//-moz-box-shadow: 0 0 2px rgb(128, 128, 128);
//-webkit-box-shadow: 0 0 2px rgb(128, 128, 128);
}
.OxThemeClassic div.OxInput.OxFocus {
-moz-box-shadow: 0 0 2px rgb(128, 128, 128);
-webkit-box-shadow: 0 0 2px rgb(128, 128, 128);
}
.OxThemeClassic .OxInput.OxPlaceholder {
color: rgb(160, 160, 160)
}
@ -120,6 +142,13 @@ Forms
background: rgb(208, 208, 208);
}
.OxThemeClassic input.OxCheckbox.OxDisabled,
.OxThemeClassic input.OxInput:disabled {
background: rgb(224, 224, 224);
}
/*
================================================================================
Lists
@ -266,5 +295,5 @@ Scrollbars
}
.OxThemeClassic ::-webkit-scrollbar:active,
.OxThemeClassic ::-webkit-scrollbar-thumb:active {
background: rgb(64, 64, 64);
background: rgb(208, 208, 208);
}

260
build/css/ox.ui.css
View file

@ -276,6 +276,14 @@ textarea {
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
/*
--------------------------------------------------------------------------------
OxButton
--------------------------------------------------------------------------------
*/
.OxButton {
text-align: center;
}
.OxButton.OxSymbol,
.OxButton.OxSymbol:active,
.OxButton.OxSymbol:focus {
@ -317,16 +325,16 @@ OxButtonGroup
-webkit-border-bottom-right-radius: 6px;
}
.OxButtonGroup > .OxButton.OxMedium:first-child {
-moz-border-radius-topleft: 4px;
-moz-border-radius-bottomleft: 4px;
-webkit-border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-topleft: 8px;
-moz-border-radius-bottomleft: 8px;
-webkit-border-top-left-radius: 8px;
-webkit-border-bottom-left-radius: 8px;
}
.OxButtonGroup > .OxButton.OxMedium:last-child {
-moz-border-radius-topright: 4px;
-moz-border-radius-bottomright: 4px;
-webkit-border-top-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
-moz-border-radius-topright: 8px;
-moz-border-radius-bottomright: 8px;
-webkit-border-top-right-radius: 8px;
-webkit-border-bottom-right-radius: 8px;
}
.OxButtonGroup > .OxButton.OxSmall:first-child {
-moz-border-radius-topleft: 2px;
@ -378,36 +386,62 @@ OxForm
}
/*
--------------------------------------------------------------------------------
OxCheckbox
--------------------------------------------------------------------------------
*/
div.OxCheckbox {
height: 16px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
input.OxCheckbox {
width: 14px;
height: 14px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
.OxCheckboxGroup > div.OxCheckbox {
float: left;
}
.OxCheckboxGroup > div.OxCheckbox {
//padding-right: 16px;
margin-right: -16px;
}
.OxCheckboxGroup > div.OxCheckbox:last-child {
//padding-right: 0;
margin-right: 0;
}
/*
--------------------------------------------------------------------------------
OxInput
--------------------------------------------------------------------------------
*/
div.OxInput {
height: 16px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
div.OxInput.OxMedium {
height: 14px;
height: 16px;
}
div.OxInput > .OxInputLabel {
float: left;
padding-left: 8px;
text-overflow: ellipsis;
padding: 0 6px 0 6px;
cursor: default;
overflow: hidden;
}
div.OxInput > .OxButton {
float: left;
//margin-left: 1px;
margin-top: -1px;
}
div.OxInput > .OxButton:last-child {
float: left;
margin-left: -1px;
margin-top: -1px;
}
input.OxInput {
float: left;
margin: -1px -1px 0 -1px;
}
/*
--------------------------------------------------------------------------------
OxInputGroup
--------------------------------------------------------------------------------
*/
.OxInputGroup {
height: 16px;
}
.OxInputGroup > div {
float: left;
}
/*
--------------------------------------------------------------------------------
@ -417,50 +451,99 @@ OxLabel
.OxLabel {
height: 14px;
border: 1px;
padding: 0 8px 0 8px;
padding: 0 6px 0 6px;
text-overflow: ellipsis;
cursor: default;
overflow: hidden;
white-space: nowrap;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
/*
--------------------------------------------------------------------------------
OxPicker
--------------------------------------------------------------------------------
*/
.OxPicker {
position: absolute;
z-index: 11;
-moz-border-radius: 0 8px 8px 8px;
-webkit-border-radius: 0 8px 8px 8px;
-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.75);
-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.75);
}
.OxPicker > div:first-child {
background: rgb(240, 240, 240);
-moz-border-radius: 0 8px 0 0;
-webkit-border-radius: 0 8px 0 0;
}
.OxPicker > .OxBar {
-moz-border-radius: 0 0 8px 8px;
-webkit-border-radius: 0 0 8px 8px;
}
.OxPicker > .OxBar > .OxLabel {
float: left;
margin: 4px 0 4px 4px;
}
.OxPicker > .OxBar > .OxButton {
float: right;
margin: 4px 4px 4px 0;
}
/*
--------------------------------------------------------------------------------
OxRange
--------------------------------------------------------------------------------
*/
.OxRange {
height: 14px;
border: 1px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
height: 16px;
}
.OxRange > .OxArrow {
float: right;
}
.OxRange > .OxArrow:first-child {
float: left;
margin-top: -1px;
}
.OxRange > .OxArrow:last-child {
float: left;
margin-left: -1px;
margin-top: -1px;
}
.OxRange > .OxTrack {
float: left;
float: right;
height: 14px;
margin-left: -1px;
margin-top: -1px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
.OxRange > .OxTrack > .OxImage {
.OxRange > .OxTrack > div {
float: left;
height: 16px;
padding: 1px;
margin: -1px;
}
.OxRange > .OxTrack > div > img {
float: left;
height: 14px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
-webkit-user-select: none;
}
.OxRange > .OxTrack > div > img.OxFirstChild {
-moz-border-radius: 7px;
-webkit-border-top-left-radius: 7px;
-webkit-border-bottom-left-radius: 7px;
}
.OxRange > .OxTrack > div > img.OxLastChild {
-moz-border-radius: 0 7px 7px 0;
-webkit-border-top-right-radius: 7px;
-webkit-border-bottom-right-radius: 7px;
}
.OxRange > .OxTrack > div > img.OxFirstChild.OxLastChild {
margin-left: 7px;
-moz-border-radius: 0;
-webkit-border-radius: 0;
}
.OxRange > .OxTrack > .OxThumb {
float: left;
margin-top: -15px;
margin: -1px;
//margin-left: -1px;
//margin-top: -1px;
text-align: center;
}
.OxRange > .OxTrack > .OxThumb:first-child {
margin-top: -1px;
//margin-top: -1px;
}
/*
--------------------------------------------------------------------------------
@ -468,22 +551,83 @@ OxSelect
--------------------------------------------------------------------------------
*/
.OxSelect.OxMedium {
margin-left: 0;
height: 14px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}
.OxSelect.OxSelected {
-moz-border-radius: 8px 8px 0 0;
-webkit-border-radius: 8px 8px 0 0;
}
.OxSelect > .OxTitle {
float: left;
height: 14px;
padding-left: 6px;
text-align: left;
text-overflow: ellipsis;
cursor: default;
overflow: hidden;
white-space: nowrap;
//margin-right: -16px;
}
.OxSelect.OxOverlapLeft > .OxTitle {
//padding-left: 20px;
//padding-right: 8px;
//margin-left: -32px;
}
.OxSelect.OxOverlapRight > .OxTitle {
//padding-left: 8px;
//padding-right: 20px;
//margin-right: -32px;
}
.OxSelect > .OxButton {
float: right;
text-align: left;
margin: -1px;
}
.OxSelect > .OxSymbol {
text-align: right;
cursor: default;
-moz-user-select: none;
-webkit-user-select: none;
.OxSelect.OxOverlapLeft > .OxButton {
//padding-left: 15px;
//padding-right: 1px;
//margin-left: -16px;
}
.OxSelect.OxMedium > .OxSymbol {
float: right;
margin: -16px 0 0 -4px;
z-index: 9;
.OxSelect.OxOverlapRight > .OxButton {
//padding-left: 1px;
//padding-right: 15px;
//margin-right: -16px;
}
/*
*/
.OxButton.OxOverlapLeft,
.OxLabel.OxOverlapLeft,
.OxxxSelect.OxOverlapLeft {
padding-left: 20px;
padding-right: 8px;
margin-left: -16px;
}
.OxButton.OxOverlapRight,
.OxLabel.OxOverlapRight,
.OxxxSelect.OxOverlapRight {
padding-left: 8px;
padding-right: 20px;
margin-right: -16px;
}
.OxButton[type=image].OxOverlapLeft {
padding-left: 15px;
padding-right: 1px;
}
.OxButton[type=image].OxOverlapRight {
padding-left: 1px;
padding-right: 15px;
}
.OxSelect.OxOverlapLeft {
//padding-left: 8px;
padding-left: 16px;
margin-left: -18px;
}
.OxSelect.OxOverlapRight {
//padding-left: 8px;
padding-right: 16px;
margin-right: -18px;
}
/*
@ -498,7 +642,6 @@ Layers
top: 0;
right: 0;
bottom: 0;
background: rgb(0, 0, 0);
opacity: 0;
overflow: hidden;
z-index: 10;
@ -509,7 +652,7 @@ Layers
.OxMainMenuLayer {
position: absolute;
width: 100%;
top: 24px;
top: 20px;
bottom: 0px;
overflow: hidden;
z-index: 10;
@ -976,9 +1119,10 @@ Miscellaneous
.OxThemeModern .OxTooltip {
position: absolute;
padding: 2px;
padding: 1px 2px 1px 2px;
font-size: 9px;
opacity: 0;
z-index: 10;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}

34
build/css/ox.ui.modern.css
View file

@ -10,6 +10,9 @@ body.OxThemeModern {
//color: rgb(0, 0, 0);
color: rgb(255, 255, 0);
}
.OxThemeModern .OxBright {
color: rgb(255, 255, 255);
}
/*
================================================================================
@ -54,9 +57,13 @@ Dialog
Forms
================================================================================
*/
.OxThemeModern .OxInput::-selection {
background: rgb(80, 80, 80);
}
.OxThemeModern .OxButton,
.OxThemeModern .OxInput,
.OxThemeModern input.OxInput,
.OxThemeModern .OxRange,
.OxThemeModern .OxTrack {
//border: 1px solid rgb(80, 80, 80);
@ -64,7 +71,6 @@ Forms
color: rgb(192, 192, 192);
}
.OxThemeModern .OxButton,
.OxThemeModern div.OxInput,
.OxThemeModern .OxRange {
background: -moz-linear-gradient(top, rgb(96, 96, 96), rgb(64, 64, 64));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(96, 96, 96)), to(rgb(64, 64, 64)));
@ -93,20 +99,27 @@ Forms
.OxThemeModern .OxFormMessage {
color: rgb(255, 64, 64);
}
.OxThemeModern .OxInput,
.OxThemeModern input.OxInput,
.OxThemeModern .OxTrack {
background: -moz-linear-gradient(top, rgb(0, 0, 0), rgb(32, 32, 32));
background: -webkit-gradient(linear, left top, left bottom, from(rgb(0, 0, 0)), to(rgb(32, 32, 32)));
}
.OxThemeModern div.OxInput.OxFocus,
.OxThemeModern .OxInput:focus {
border: 1px solid rgb(80, 80, 80);
.OxThemeModern div.OxInput.OxFocus {
//border: 1px solid rgb(80, 80, 80);
-moz-box-shadow: 0 0 2px rgb(128, 128, 128);
-webkit-box-shadow: 0 0 2px rgb(128, 128, 128);
}
.OxThemeModern div.OxInput.OxFocus > .OxInputLabel {
border-color: rgb(80, 80, 80);
}
.OxThemeModern .OxInput.OxPlaceholder {
color: rgb(96, 96, 96)
}
.OxThemeModern .OxLabel {
border: 1px solid rgb(48, 48, 48);
background: rgb(80, 80, 80);
color: rgb(192, 192, 192);
}
/*
================================================================================
@ -250,8 +263,9 @@ Miscellaneous
*/
.OxThemeModern .OxTooltip {
border: 1px solid rgb(255, 255, 255);
background: rgba(0, 0, 0, 0.9);
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 1);
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 1);
border: 1px solid rgba(128, 128, 128, 0.75);
background: rgba(0, 0, 0, 0.75);
color: rgba(128, 128, 128, 1);
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
}