solved conflict for member_new_ui

This commit is contained in:
Spen authored and saurabhbhatia committed 2013-08-12 15:40:34 +08:00
1 parent 9c7558847a
commit 6c514770bc
92 files changed
+3204 -2102

No files matched your search

+10 -5
View File
@@ -449,9 +449,15 @@ if($.support.touch) {
})
if($sidebarState) {
if(!$('.sidebar-nav').hasClass('no-sub-nav')) {
$('.bottomnav').css({
'left': 261,
});
if($('#basic-info').length) {
$('.bottomnav').css({
'left': 631,
});
} else {
$('.bottomnav').css({
'left': 261,
});
}
}
}
}
@@ -559,8 +565,7 @@ $(function() {
if($('#sidebar').length) {
if(!/MSIE 8.0/g.test(navigator.userAgent)){
document.getElementById('sidebar').addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
}
// demo_fu1();
};
}
if($('#pageslide').length) {
openSlide();