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

style fixes for sidebar in/out

Browse Source
This commit is contained in:
Oliver Gorwits
2012-02-01 13:37:17 +00:00
parent c7bae9b638
commit 74c8443d9f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,9 +205,9 @@ h3.device_label {
/* for placing the sidebar toggle icons */
#sidebar_toggle_img_in {
float: right;
margin-top: -7px;
margin-right: -16px;
float: left;
margin-top: -6px;
margin-left: -18px;
cursor: pointer;
}
@@ -226,8 +226,7 @@ h3.device_label {
/* make the sidebar fixed on the screen */
.container-fluid > .sidebar {
position: fixed;
margin-top: 50px;
position: absolute;
right: 20px;
width: 200px;
left: auto;

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

@@ -120,7 +120,7 @@ $(document).ready(function() {
$('.sidebar').toggle(
function() {
$('#sidebar_toggle_img_out').toggle();
$('.content').animate({'margin-right': '10px !important'}, 100);
$('.content').animate({'margin-right': '10px !important'}, 50);
$('.device_label_right').toggle();
}
);
@@ -129,10 +129,11 @@ $(document).ready(function() {
$('#sidebar_toggle_img_out').click(
function() {
$('#sidebar_toggle_img_out').toggle();
$('.content').animate({'margin-right': '220px !important'}, 200,
$('.content').animate({'margin-right': '220px !important'}, 100,
function() {
$('.device_label_right').toggle();
$('.sidebar').toggle(200);
$(window).scrollTop(0);
}
);
}