[limb-svn] r6989 - in 3.x/trunk/limb/cms/shared: images/bgr js styles
svn at limb-project.com
svn at limb-project.com
Thu May 8 18:24:58 MSD 2008
Author: wiliam
Date: 2008-05-08 18:24:58 +0400 (Thu, 08 May 2008)
New Revision: 6989
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6989
Modified:
3.x/trunk/limb/cms/shared/images/bgr/button.gif
3.x/trunk/limb/cms/shared/js/cp_layout.js
3.x/trunk/limb/cms/shared/styles/cp.css
Log:
-- fix bug in IE, when layout rebuilding - temporary
Modified: 3.x/trunk/limb/cms/shared/images/bgr/button.gif
===================================================================
(Binary files differ)
Modified: 3.x/trunk/limb/cms/shared/js/cp_layout.js
===================================================================
--- 3.x/trunk/limb/cms/shared/js/cp_layout.js 2008-05-08 09:55:58 UTC (rev 6988)
+++ 3.x/trunk/limb/cms/shared/js/cp_layout.js 2008-05-08 14:24:58 UTC (rev 6989)
@@ -289,19 +289,11 @@
function initDocumentStructure(){
var container = jQuery('#container');
var sidebar = jQuery('#sidebar');
- var toggle = jQuery('.sidebar_toggle');
- var text = jQuery('.sidebar_toggle span.text');
var bodyHeight = jQuery('body').height()-40;
container.height(bodyHeight);
sidebar.height(bodyHeight);
- if (text.css('display')=='block')
- return;
-
- toggle.height (bodyHeight -13);
-
-
};
function initMainMenu(){
@@ -335,8 +327,11 @@
/*SideBar Toggle*/
new CMS.SidebarToggle('sidebar_toggle');
- initDocumentStructure();
- jQuery(window).resize(initDocumentStructure);
+ if(!jQuery.browser.msie)
+ {
+ initDocumentStructure();
+ jQuery(window).resize(initDocumentStructure);
+ }
/*Nice Button*/
jQuery('.button').wrap('<span class="button_wrapper"></span>');
Modified: 3.x/trunk/limb/cms/shared/styles/cp.css
===================================================================
--- 3.x/trunk/limb/cms/shared/styles/cp.css 2008-05-08 09:55:58 UTC (rev 6988)
+++ 3.x/trunk/limb/cms/shared/styles/cp.css 2008-05-08 14:24:58 UTC (rev 6989)
@@ -172,7 +172,7 @@
/*=CONTENT*/
#wrapper {position:relative;min-height:100%;_height:100%;}
- #container {float: right;width:100%;}
+ #container {float: right;width:100%;overflow:auto;position:relative;z-index:10;}
#content {margin: 25px 15px 0 225px;_height:1%;}
@@ -190,9 +190,9 @@
/*SIDEBAR ======================================================================================*/
- #sidebar {float: left;width: 225px;margin: 0 -225px 0 0;}
+ #sidebar {float: left;width: 225px;margin: 0 -225px 0 0;position:relative;z-index:15;}
#sidebar .sidebar_toggle {width:198px;height:auto;overflow:hidden;_height:1%;_overflow:visible;margin:1px 0 1px 1px;padding:5px 0;background-color:#E5E5E5;border:1px solid #bbbbbb;}
- #sidebar.hide {width:30px;position:absolute;overflow:hidden;top:38px;left:0;z-index:20;}
+ #sidebar.hide {width:30px;position:absolute;overflow:hidden;left:0;}
#sidebar.hide .sidebar_toggle {position:absolute;top:0;padding:5px;width:10px}
#sidebar .sidebar_toggle .text {margin:0 10px 0 6px;float:left;}
#sidebar .sidebar_toggle .arrow {float:right;display:block;width:10px;height:9px;margin:1px 6px 0 0;background: url(../images/icon/arrow.gif) no-repeat left top;cursor:pointer;}
More information about the limb-svn
mailing list