Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-21 09:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Dmitry Nehaychik 2016-10-27 17:22:25 +03:00
commit f60fa581a3
8 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/theme/components/baContentTop/baContentTop.scss
View file

@ -32,7 +32,7 @@ h1.al-title {
} }
&.breadcrumb-item.active { &.breadcrumb-item.active {
color: $default; color: $default-text;
} }
} }
} }

2
src/app/theme/components/baMenu/baMenu.service.ts
View file

@ -80,7 +80,7 @@ export class BaMenuService {
item.route.paths = item.route.path; item.route.paths = item.route.path;
} else { } else {
item.route.paths = parent && parent.route && parent.route.paths ? parent.route.paths.slice(0) : ['/']; item.route.paths = parent && parent.route && parent.route.paths ? parent.route.paths.slice(0) : ['/'];
item.route.paths.push(item.route.path); if (!!item.route.path) item.route.paths.push(item.route.path);
} }
if (object.children && object.children.length > 0) { if (object.children && object.children.length > 0) {

2
src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html
View file

@ -8,7 +8,7 @@
<i *ngIf="menuItem.icon" class="{{ menuItem.icon }}"></i><span>{{ menuItem.title }}</span> <i *ngIf="menuItem.icon" class="{{ menuItem.icon }}"></i><span>{{ menuItem.title }}</span>
</a> </a>
<a *ngIf="menuItem.children" (mouseenter)="onHoverItem($event, item)" (click)="onToggleSubMenu($event, menuItem)" class="al-sidebar-list-link"> <a *ngIf="menuItem.children" (mouseenter)="onHoverItem($event, item)" href (click)="onToggleSubMenu($event, menuItem)" class="al-sidebar-list-link">
<i *ngIf="menuItem.icon" class="{{ menuItem.icon }}"></i><span>{{ menuItem.title }}</span> <i *ngIf="menuItem.icon" class="{{ menuItem.icon }}"></i><span>{{ menuItem.title }}</span>
<b class="fa fa-angle-down" [ngClass]="{'fa-angle-up': menuItem.expanded}"></b> <b class="fa fa-angle-down" [ngClass]="{'fa-angle-up': menuItem.expanded}"></b>
</a> </a>

1
src/app/theme/components/baPageTop/baPageTop.component.ts
View file

@ -22,6 +22,7 @@ export class BaPageTop {
public toggleMenu() { public toggleMenu() {
this.isMenuCollapsed = !this.isMenuCollapsed; this.isMenuCollapsed = !this.isMenuCollapsed;
this._state.notifyDataChanged('menu.isCollapsed', this.isMenuCollapsed); this._state.notifyDataChanged('menu.isCollapsed', this.isMenuCollapsed);
return false;
} }
public scrolledChanged(isScrolled) { public scrolledChanged(isScrolled) {

2
src/app/theme/components/baPageTop/baPageTop.html
View file

@ -1,7 +1,7 @@
<div class="page-top clearfix" baScrollPosition maxHeight="50" (scrollChange)="scrolledChanged($event)" <div class="page-top clearfix" baScrollPosition maxHeight="50" (scrollChange)="scrolledChanged($event)"
[ngClass]="{scrolled: isScrolled}"> [ngClass]="{scrolled: isScrolled}">
<a routerLink="/pages/dashboard" class="al-logo clearfix"><span>ng2-</span>admin</a> <a routerLink="/pages/dashboard" class="al-logo clearfix"><span>ng2-</span>admin</a>
<a (click)="toggleMenu()" class="collapse-menu-link ion-navicon"></a> <a href (click)="toggleMenu()" class="collapse-menu-link ion-navicon"></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>

10
src/app/theme/components/baSidebar/baSidebar.scss
View file

@ -1,6 +1,6 @@
@import '../../sass/conf/conf'; @import '../../sass/conf/conf';
$sidebar-width: 180px; $sidebar-scroll-width: 4px;
$angle-left: "\f100"; $angle-left: "\f100";
$angle-right: "\f101"; $angle-right: "\f101";
@ -113,8 +113,8 @@ a.al-sidebar-list-link {
.slimScrollBar, .slimScrollRail { .slimScrollBar, .slimScrollRail {
border-radius: 0px !important; border-radius: 0px !important;
width: 4px !important; width: $sidebar-scroll-width !important;
left: 176px; left: $sidebar-width - $sidebar-scroll-width;
} }
@mixin layout-collapsed() { @mixin layout-collapsed() {
@ -170,11 +170,11 @@ a.al-sidebar-list-link {
} }
.sidebar-hover-elem{ .sidebar-hover-elem{
width: 4px; width: $sidebar-scroll-width;
background: $primary; background: $primary;
position: absolute; position: absolute;
top: -150px; top: -150px;
left: 176px; left: $sidebar-width - $sidebar-scroll-width;
transition: all 0.5s ease; transition: all 0.5s ease;
transition-property: top, height; transition-property: top, height;
height: 42px; height: 42px;

6
src/app/theme/sass/_layout.scss
View file

@ -1,4 +1,6 @@
$left-space: 180px; @import 'conf/conf';
$left-space: $sidebar-width;
@include scrollbars(.5em, #d9d9d9, rgba(0, 0, 0, 0)); @include scrollbars(.5em, #d9d9d9, rgba(0, 0, 0, 0));
@ -66,7 +68,7 @@ a {
.al-footer { .al-footer {
height: 34px; height: 34px;
padding: 0 18px 0 200px; padding: 0 18px 0 ($left-space + 20px);
width: 100%; width: 100%;
position: absolute; position: absolute;
display: block; display: block;

1
src/app/theme/sass/conf/_variables.scss
View file

@ -10,6 +10,7 @@ $resXXS: 435px;
$resMin: 320px; $resMin: 320px;
$top-height: 66px; $top-height: 66px;
$sidebar-width: 180px;
$small-card-height: 114px; $small-card-height: 114px;
$xsmall-card-height: 187px; $xsmall-card-height: 187px;