merging changes

This commit is contained in:
rlx 2011-03-04 03:50:37 +00:00
commit ee027fb760
3 changed files with 59 additions and 90 deletions

View file

@ -719,7 +719,7 @@ Lists
}
.OxIconList .OxPage {
//position: absolute;
position: absolute;
left: 0;
right: 0;
margin-left: auto;
@ -799,6 +799,11 @@ Lists
//-webkit-user-select: text;
}
.OxTextList {
top: 0;
bottom: 0;
}
.OxTextList .OxBar {
//z-index: 10;
//-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.75);
@ -892,7 +897,7 @@ Lists
.OxTextList .OxBody {
float: left;
//position: absolute;
position: absolute;
left: 0;
top: 0;
right: 0;
@ -943,7 +948,7 @@ Lists
cursor: ns-resize;
}
.OxTextList .OxPage {
//position: absolute;
position: absolute;
}
.OxTextList.OxDrop .OxItem .OxCell {
color: green;