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

merge

Browse source
This commit is contained in:
j 2011-01-23 01:01:15 +05:30
commit ca1965312a
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1191,10 +1191,11 @@ Panels
.OxCollapsePanel > .OxBar > .OxExtras > .OxSelect { .OxCollapsePanel > .OxBar > .OxExtras > .OxSelect {
//position: absolute; //position: absolute;
//right: 0px; //right: 0px;
width: 14px; width: 16px;
height: 16px; height: 16px;
padding-top: 1px; padding: 1px 1px 0 0;
border-width: 0 0 0 1px; border-width: 0;
background: rgba(0, 0, 0, 0);
-moz-border-radius: 0; -moz-border-radius: 0;
-webkit-border-radius: 0; -webkit-border-radius: 0;
} }

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

@ -104,7 +104,8 @@ Forms
color: rgb(128, 128, 128); color: rgb(128, 128, 128);
} }
.OxThemeModern .OxButton.OxSelected, .OxThemeModern .OxButton.OxSelected,
.OxThemeModern .OxSelect.OxSelected { .OxThemeModern .OxSelect.OxSelected,
.OxThemeModern .OxCollapsePanel > .OxBar > .OxExtras > .OxSelect.OxSelected {
//background: -moz-linear-gradient(left top, left bottom, from(rgb(80, 80, 80)), to(rgb(112, 112, 112))); //background: -moz-linear-gradient(left top, left bottom, from(rgb(80, 80, 80)), to(rgb(112, 112, 112)));
//background: -webkit-gradient(linear, left top, left bottom, from(rgb(80, 80, 80)), to(rgb(112, 112, 112))); //background: -webkit-gradient(linear, left top, left bottom, from(rgb(80, 80, 80)), to(rgb(112, 112, 112)));
background: -moz-linear-gradient(top, rgb(0, 0, 0), rgb(32, 32, 32) 10%, rgb(64, 64, 64)); background: -moz-linear-gradient(top, rgb(0, 0, 0), rgb(32, 32, 32) 10%, rgb(64, 64, 64));

2
build/js/ox.ui.js
View file

@ -132,7 +132,7 @@ requires
self.time = +new Date(); self.time = +new Date();
self.options = $.extend({ self.options = $.extend({
apiTimeout: 15000, apiTimeout: 60000,
apiType: 'POST', apiType: 'POST',
apiURL: '', apiURL: '',
config: '', config: '',