jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

fix expand/collapse menu

pull/3/head
KostyaDanovsky 2015-11-13 20:24:27 +03:00
parent 5f15d5dc9d
commit 6c52ba22eb
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/pageTop/pageTop.html
View File

@ -1,6 +1,6 @@
<div class="page-top clearfix"> <div class="page-top clearfix">
<a href="#/dashboard" class="al-logo clearfix"><span>Blur</span>Admin</a> <a href="#/dashboard" class="al-logo clearfix"><span>Blur</span>Admin</a>
<a href class="collapse-menu-link ion-navicon" ng-click="menuToggle()"></a> <a href class="collapse-menu-link ion-navicon" ng-click="isMenuCollapsed=!isMenuCollapsed"></a>
<div class="search"> <div class="search">
<i class="ion-ios-search-strong" ng-click="startSearch()"></i> <i class="ion-ios-search-strong" ng-click="startSearch()"></i>

4
src/app/components/sidebar/_sidebar.scss
View File

@ -83,7 +83,7 @@ a.al-sidebar-list-link {
@mixin layout-collapsed() { @mixin layout-collapsed() {
.al-main { .al-main {
margin-left: 70px; margin-left: 50px;
} }
.al-footer { .al-footer {
@ -140,7 +140,7 @@ a.al-sidebar-list-link {
left: 176px; left: 176px;
height: 42px; height: 42px;
display: none; display: none;
transition: all 0.3s ease; transition: all 0.5s ease;
&.show-hover-elem { &.show-hover-elem {
height: 42px; height: 42px;
display: block; display: block;

8
src/app/components/sidebar/sidebar.js
View File

@ -123,13 +123,11 @@ blurAdminApp.directive('sidebar', function () {
$scope.isMenuCollapsed = true; $scope.isMenuCollapsed = true;
}; };
$scope.menuToggle = function () { $scope.$watch('isMenuCollapsed', function(newValue) {
$scope.isMenuCollapsed = !$scope.isMenuCollapsed; if (!newValue && !$scope.selectElemTop) {
if (!$scope.isMenuCollapsed && !$scope.selectElemTop) {
changeSelectElemTopValue(); changeSelectElemTopValue();
} }
}; })
// watch window resize to change menu collapsed state if needed // watch window resize to change menu collapsed state if needed
$(window).resize(function () { $(window).resize(function () {