135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sidebar css actions #15

Browse Source
This commit is contained in:
Oliver Gorwits
2012-04-09 13:03:20 +01:00
parent efb15e9070
commit 0f81f5a9ff
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Changes
View File

@@ -1,4 +1,10 @@
0.5 0.x
[BUG FIXES]
* Fix sidebar hiding not making main content reflow to full window width (#15)
0.5 2012-03-09
[NEW FEATURES] [NEW FEATURES]
@@ -18,7 +24,7 @@
* Set distinct on device search (#12) * Set distinct on device search (#12)
* Fix strikethrough on tab change (#9) * Fix strikethrough on tab change (#9)
0.4 0.4 2012-02-19
[NEW FEATURES] [NEW FEATURES]

2
Netdisco/public/css/netdisco.css
View File

@@ -323,7 +323,7 @@ form .clearfix.success input {
/* make the content start more to the left now the sidebar is narrower */ /* make the content start more to the left now the sidebar is narrower */
.container-fluid > .content { .container-fluid > .content {
margin-right: 220px; margin-right: 215px;
margin-left: 0px; margin-left: 0px;
} }

26
Netdisco/public/javascripts/netdisco.js
View File

@@ -16,14 +16,14 @@ function do_search (event, tab) {
// and whether the sidebar contains any content (detected by TT) // and whether the sidebar contains any content (detected by TT)
if (has_sidebar[tab] == 0) { if (has_sidebar[tab] == 0) {
$('.sidebar, #sidebar_toggle_img_out').hide(); $('.sidebar, #sidebar_toggle_img_out').hide();
$('.content').css('margin-right', '10px !important'); $('.content').css('margin-right', '10px');
} }
else { else {
if (sidebar_hidden) { if (sidebar_hidden) {
$('#sidebar_toggle_img_out').show(); $('#sidebar_toggle_img_out').show();
} }
else { else {
$('.content').css('margin-right', '220px !important'); $('.content').css('margin-right', '215px');
$('.sidebar').show(); $('.sidebar').show();
} }
} }
@@ -143,24 +143,18 @@ $(document).ready(function() {
}); });
// sidebar toggle - trigger in/out on image click() // sidebar toggle - trigger in/out on image click()
$('#sidebar_toggle_img_in').click(function() { $('#sidebar_toggle_img_in').click(function() {
$('.sidebar').toggle( $('.sidebar').toggle(250);
function() { $('#sidebar_toggle_img_out').toggle();
$('#sidebar_toggle_img_out').toggle(); $('.content').css('margin-right', '10px');
$('.content').animate({'margin-right': '10px !important'}, 50);
}
);
sidebar_hidden = 1; sidebar_hidden = 1;
}); });
$('#sidebar_toggle_img_out').click(function() { $('#sidebar_toggle_img_out').click(function() {
$('#sidebar_toggle_img_out').toggle(); $('#sidebar_toggle_img_out').toggle();
$('.content').animate({'margin-right': '220px !important'}, 100, $('.content').css('margin-right', '215px');
function() { $('.sidebar').toggle(250);
$('.sidebar').toggle(200); if (! $('.sidebar').hasClass('sidebar_pinned')) {
if (! $('.sidebar').hasClass('sidebar_pinned')) { $(window).scrollTop(0);
$(window).scrollTop(0); }
}
}
);
sidebar_hidden = 0; sidebar_hidden = 0;
}); });