From 9fa83fa98f82415c72d686989f6a29459da09610 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Thu, 3 Mar 2011 23:16:49 +0000 Subject: [PATCH] reverting changes --- build/css/ox.ui.classic.css | 2 +- build/css/ox.ui.css | 48 +++++++++++++++++++++++-------------- build/css/ox.ui.modern.css | 2 +- build/js/ox.ui.js | 6 ++--- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/build/css/ox.ui.classic.css b/build/css/ox.ui.classic.css index 52cf34f2..4d7631e8 100644 --- a/build/css/ox.ui.classic.css +++ b/build/css/ox.ui.classic.css @@ -25,7 +25,7 @@ Bars 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 .OxSeparator > .OxLine { +.OxThemeClassic .OxResizebar > .OxLine { background-color: rgb(208, 208, 208); } diff --git a/build/css/ox.ui.css b/build/css/ox.ui.css index f9c120fa..4796ab97 100644 --- a/build/css/ox.ui.css +++ b/build/css/ox.ui.css @@ -719,7 +719,7 @@ Lists } .OxIconList .OxPage { - //position: absolute; + position: absolute; left: 0; right: 0; margin-left: auto; @@ -805,7 +805,7 @@ Lists //-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.75); } .OxTextList .OxBar .OxHead { - // position: absolute; + position: absolute; left: 0; height: 16px; overflow: hidden; @@ -873,7 +873,7 @@ Lists background: rgb(24, 24, 24); } .OxTextList .OxBar .OxSelect { - //position: absolute; + position: absolute; right: 0px; width: 11px; height: 16px; @@ -891,8 +891,8 @@ Lists } .OxTextList .OxBody { - //float: left; - //position: absolute; + float: left; + position: absolute; left: 0; top: 0; right: 0; @@ -943,7 +943,7 @@ Lists cursor: ns-resize; } .OxTextList .OxPage { - //position: absolute; + position: absolute; } .OxTextList.OxDrop .OxItem .OxCell { color: green; @@ -1229,6 +1229,18 @@ Panels } .OxSplitPanel { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + overflow: hidden; +} +.OxSplitPanel > * { + position: absolute; +} + +.OxSplitPanel_ { display: box; display: -moz-box; display: -webkit-box; @@ -1237,52 +1249,52 @@ Panels -mox-box-flex: 0; -webkit-box-flex: 0; } -.OxSplitPanel.OxHorizontal { +.OxSplitPanel_.OxHorizontal { box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal; } -.OxSplitPanel.OxVertical { +.OxSplitPanel_.OxVertical { box-orient: vertical; -moz-box-orient: vertical; -webkit-box-orient: vertical; } -.OxSplitPanel > * { +.OxSplitPanel_ > * { box-flex: 0; -mox-box-flex: 0; -webkit-box-flex: 0; } -.OxSplitPanel > .OxSeparator { +.OxSplitPanel_ > .OxSeparator { display: -webkit-box; position: relative; z-index: 2; } -.OxSplitPanel > .OxSeparator > * { +.OxSplitPanel_ > .OxSeparator > * { -webkit-box-flex: 0; } -.OxSplitPanel > .OxSeparator > .OxLine { +.OxSplitPanel_ > .OxSeparator > .OxLine { background-color: black; } -.OxSplitPanel.OxHorizontal > .OxSeparator { +.OxSplitPanel_.OxHorizontal > .OxSeparator { width: 5px; margin: 0 -2px 0 -2px; cursor: ew-resize; } -.OxSplitPanel.OxHorizontal > .OxSeparator > .OxLine { +.OxSplitPanel_.OxHorizontal > .OxSeparator > .OxLine { width: 1px; } -.OxSplitPanel.OxHorizontal > .OxSeparator > .OxSpace { +.OxSplitPanel_.OxHorizontal > .OxSeparator > .OxSpace { width: 2px; } -.OxSplitPanel.OxVertical > .OxSeparator { +.OxSplitPanel_.OxVertical > .OxSeparator { height: 5px; margin: -2px 0 -2px 0; cursor: ns-resize; } -.OxSplitPanel.OxVertical > .OxSeparator > .OxLine { +.OxSplitPanel_.OxVertical > .OxSeparator > .OxLine { height: 1px; } -.OxSplitPanel.OxVertical > .OxSeparator > .OxSpace { +.OxSplitPanel_.OxVertical > .OxSeparator > .OxSpace { height: 2px; } /* diff --git a/build/css/ox.ui.modern.css b/build/css/ox.ui.modern.css index 3541a2e2..4a70fbb4 100644 --- a/build/css/ox.ui.modern.css +++ b/build/css/ox.ui.modern.css @@ -27,7 +27,7 @@ Bars background: -webkit-gradient(linear, left top, left bottom, from(rgb(64, 64, 64)), to(rgb(32, 32, 32))); } -.OxThemeModern .OxSeparator > .OxLine { +.OxThemeModern .OxResizebar > .OxLine { background: rgb(48, 48, 48); } diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js index 4eec1dfd..13d15ab2 100644 --- a/build/js/ox.ui.js +++ b/build/js/ox.ui.js @@ -11170,7 +11170,7 @@ requires return that; }; - Ox.SplitPanel = function(options, self) { + Ox.SplitPanel_ = function(options, self) { var self = self || {}, that = new Ox.Element('div', self) @@ -11180,7 +11180,7 @@ requires }) .options(options) .addClass( - 'OxSplitPanel Ox' + Ox.toTitleCase(self.options.orientation) + 'OxSplitPanel_ Ox' + Ox.toTitleCase(self.options.orientation) ); Ox.extend(self, { @@ -11419,7 +11419,7 @@ requires resize toggle */ - Ox._SplitPanel = function(options, self) { + Ox.SplitPanel = function(options, self) { var self = self || {}, that = new Ox.Element({}, self) // fixme: Container .defaults({