Skip to content

Commit

Permalink
fix smoke over sidebar fixes #1056
Browse files Browse the repository at this point in the history
  • Loading branch information
benhaynes committed Jan 21, 2016
1 parent 498f271 commit e68a18c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
4 changes: 3 additions & 1 deletion app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ require(["config"], function() {
new_nonces = new_nonces.split(',');
nonces.pool.push.apply(nonces.pool, new_nonces);
}
}
};
}
}
}
Expand All @@ -380,11 +380,13 @@ require(["config"], function() {
// Toggle responsive navigation
$(document).on("click", ".responsive-nav-toggle", function(e) {
$('#main').toggleClass('sidebar-active');
$('.invisible-blocker').toggleClass('sidebar-active');
});

// Close sidebar when clicking
$(document).on("click", "#sidebar", function(e) {
$('#main').removeClass('sidebar-active');
$('.invisible-blocker').removeClass('sidebar-active');
});

// Cancel default file drop
Expand Down
6 changes: 4 additions & 2 deletions assets/css/directus.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 11 additions & 5 deletions assets/scss/directus/_responsive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,17 @@ $hamburger-height: 7px;
}
}
}

#page-blocker-smoke {
left: 60px;
}
.invisible-blocker {
&.sidebar-active {
#page-blocker-smoke {
left: 170px;
}
}
#page-blocker-smoke {
left: 0;
}
}

}

//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////

0 comments on commit e68a18c

Please sign in to comment.