code reformat to follow the styles

This commit is contained in:
nixa 2016-04-29 17:27:19 +03:00
parent 669b3df4b5
commit a8cd300ecc
26 changed files with 193 additions and 187 deletions

View file

@ -1,6 +1,3 @@
/*
* Angular 2 decorators and services
*/
import {Component, ViewEncapsulation} from 'angular2/core'; import {Component, ViewEncapsulation} from 'angular2/core';
import {RouteConfig, Router} from 'angular2/router'; import {RouteConfig, Router} from 'angular2/router';
import {Subscription} from 'rxjs/Subscription'; import {Subscription} from 'rxjs/Subscription';

View file

@ -16,7 +16,8 @@ import {Component, ViewEncapsulation} from 'angular2/core';
}) })
export class Dashboard { export class Dashboard {
constructor() {} constructor() {
}
ngOnInit() { ngOnInit() {
console.log('DASHBOARD'); console.log('DASHBOARD');

View file

@ -36,9 +36,11 @@ export class Pages {
private _routeConfig; private _routeConfig;
constructor(private _router: Router) { } constructor(private _router:Router) {
}
ngOnInit() { } ngOnInit() {
}
getRoutes() { getRoutes() {

View file

@ -1,4 +1,5 @@
import {Directive, Input, Output, EventEmitter, HostListener, ElementRef} from 'angular2/core'; import {Directive, Input, Output, EventEmitter, HostListener, ElementRef} from 'angular2/core';
@Directive({ @Directive({
selector: '[scrollPosition]' selector: '[scrollPosition]'
}) })

View file

@ -16,7 +16,8 @@
</div> </div>
<div class="msg-list"> <div class="msg-list">
<a *ngFor="#msg of notifications" href class="clearfix"> <a *ngFor="#msg of notifications" href class="clearfix">
<div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}" src="{{ ( msg.image || (msg.name | profilePicture)) }}"></div> <div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}"
src="{{ ( msg.image || (msg.name | profilePicture)) }}"></div>
<div class="msg-area"> <div class="msg-area">
<div>{{ msg.text }}</div> <div>{{ msg.text }}</div>
<span>{{ msg.time }}</span> <span>{{ msg.time }}</span>
@ -40,7 +41,8 @@
</div> </div>
<div class="msg-list"> <div class="msg-list">
<a *ngFor="#msg of messages" href class="clearfix"> <a *ngFor="#msg of messages" href class="clearfix">
<div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}" src="{{ ( msg.image || (msg.name | profilePicture)) }}"></div> <div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}"
src="{{ ( msg.image || (msg.name | profilePicture)) }}"></div>
<div class="msg-area"> <div class="msg-area">
<div>{{ msg.text }}</div> <div>{{ msg.text }}</div>
<span>{{ msg.time }}</span> <span>{{ msg.time }}</span>

View file

@ -1,4 +1,5 @@
<div class="page-top clearfix" scrollPosition maxHeight="50" (scrollChange)="scrolledChanged($event)" [ngClass]="{scrolled: isScrolled}"> <div class="page-top clearfix" scrollPosition maxHeight="50" (scrollChange)="scrolledChanged($event)"
[ngClass]="{scrolled: isScrolled}">
<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 (click)="toggleMenu()" class="collapse-menu-link ion-navicon"></a> <a (click)="toggleMenu()" class="collapse-menu-link ion-navicon"></a>

View file

@ -124,7 +124,6 @@ button.btn.btn-danger {
} }
} }
button.btn.btn-inverse { button.btn.btn-inverse {
@include buttonColor($help-text, $help-text); @include buttonColor($help-text, $help-text);
color: $default; color: $default;
@ -134,8 +133,6 @@ button.btn.btn-inverse {
} }
} }
.btn-with-icon { .btn-with-icon {
i { i {
margin-right: 10px; margin-right: 10px;

View file

@ -22,7 +22,6 @@
@include svg-icon-class('person', 80, 80); @include svg-icon-class('person', 80, 80);
@include svg-icon-class('refresh', 80, 80); @include svg-icon-class('refresh', 80, 80);
@mixin png-icon($url, $width, $height) { @mixin png-icon($url, $width, $height) {
display: inline-block; display: inline-block;
width: $width + px; width: $width + px;

View file

@ -18,9 +18,7 @@ body {
@include main-background(); @include main-background();
} }
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none)
{
html { html {
overflow: hidden; overflow: hidden;
height: 100%; height: 100%;
@ -39,6 +37,7 @@ a {
.body-bg { .body-bg {
display: none; display: none;
} }
.al-header { .al-header {
display: block; display: block;
height: 49px; height: 49px;

View file

@ -6,6 +6,7 @@
transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */ transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */
} }
} }
@-moz-keyframes spin { @-moz-keyframes spin {
0% { 0% {
-moz-transform: rotate(0deg); /* Firefox 16+*/ -moz-transform: rotate(0deg); /* Firefox 16+*/

View file

@ -282,13 +282,13 @@ th {
.table-striped > tbody > tr > td { .table-striped > tbody > tr > td {
border: none; border: none;
} }
.pagination > li > a, .pagination > li > a,
.pagination > li > span { .pagination > li > span {
color: $default; color: $default;
border-color: $default; border-color: $default;
} }
.pagination > li:first-of-type > a, .pagination > li:first-of-type > a,
.pagination > li:first-of-type > span { .pagination > li:first-of-type > span {
border-top-left-radius: 5px; border-top-left-radius: 5px;

View file

@ -178,7 +178,6 @@ $panel-heading-font-size: 16px;
font-weight: $font-light; font-weight: $font-light;
} }
/* /*
.panel-group .panel { .panel-group .panel {
border-radius: 0; border-radius: 0;

View file

@ -41,6 +41,7 @@
@mixin bg-nr($relativeUrl) { @mixin bg-nr($relativeUrl) {
background: url($images-root + $relativeUrl) no-repeat 0 0; background: url($images-root + $relativeUrl) no-repeat 0 0;
} }
@mixin bg($relativeUrl) { @mixin bg($relativeUrl) {
background: url($images-root + $relativeUrl); background: url($images-root + $relativeUrl);
} }

View file

@ -33,7 +33,8 @@ export class Sidebar {
constructor(private elementRef:ElementRef, constructor(private elementRef:ElementRef,
private router:Router, private router:Router,
private _sidebarService:SidebarService, private _sidebarService:SidebarService,
private _sidebarStateService: SidebarStateService) { } private _sidebarStateService:SidebarStateService) {
}
ngOnInit() { ngOnInit() {
this.menuItems = this._sidebarService.getMenuItems(this.routes); this.menuItems = this._sidebarService.getMenuItems(this.routes);

View file

@ -7,21 +7,26 @@
<i class="{{ item.icon }}"></i><span>{{ item.title }}</span> <i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
</a> </a>
<a *ngIf="item.subMenu" (mouseenter)="hoverItem($event, item)" (click)="toggleSubMenu($event, item)" class="al-sidebar-list-link"> <a *ngIf="item.subMenu" (mouseenter)="hoverItem($event, item)" (click)="toggleSubMenu($event, item)"
class="al-sidebar-list-link">
<i class="{{ item.icon }}"></i><span>{{ item.title }}</span> <i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
<b class="fa" [ngClass]="{'fa-angle-up': item.expanded, 'fa-angle-down': !item.expanded}" *ngIf="item.subMenu"></b> <b class="fa" [ngClass]="{'fa-angle-up': item.expanded, 'fa-angle-down': !item.expanded}"
*ngIf="item.subMenu"></b>
</a> </a>
<ul *ngIf="item.subMenu" class="al-sidebar-sublist" <ul *ngIf="item.subMenu" class="al-sidebar-sublist"
[ngClass]="{expanded: item.expanded, 'slide-right': item.slideRight}"> [ngClass]="{expanded: item.expanded, 'slide-right': item.slideRight}">
<li *ngFor="#subitem of item.subMenu" [ngClass]="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}"> <li *ngFor="#subitem of item.subMenu"
[ngClass]="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}">
<a (mouseenter)="hoverItem($event, item)" *ngIf="subitem.subMenu" (click)="toggleSubMenu($event, subitem);" <a (mouseenter)="hoverItem($event, item)" *ngIf="subitem.subMenu" (click)="toggleSubMenu($event, subitem);"
class="al-sidebar-list-link subitem-submenu-link"><span>{{ subitem.title }}</span> class="al-sidebar-list-link subitem-submenu-link"><span>{{ subitem.title }}</span>
<b class="fa" *ngIf="subitem.subMenu" [ngClass]="{'fa-angle-up': subitem.expanded, 'fa-angle-down': !subitem.expanded}"></b> <b class="fa" *ngIf="subitem.subMenu"
[ngClass]="{'fa-angle-up': subitem.expanded, 'fa-angle-down': !subitem.expanded}"></b>
</a> </a>
<ul *ngIf="subitem.subMenu" class="al-sidebar-sublist subitem-submenu-list" <ul *ngIf="subitem.subMenu" class="al-sidebar-sublist subitem-submenu-list"
[ngClass]="{expanded: subitem.expanded, 'slide-right': subitem.slideRight}"> [ngClass]="{expanded: subitem.expanded, 'slide-right': subitem.slideRight}">
<li *ngFor="#subSubitem of subitem.subMenu" (mouseenter)="hoverItem($event, item)" [ngClass]="{selected: subitem.selected}"> <li *ngFor="#subSubitem of subitem.subMenu" (mouseenter)="hoverItem($event, item)"
[ngClass]="{selected: subitem.selected}">
<a (mouseenter)="hoverItem($event, item)" [routerLink]="[subSubitem.name]"> <a (mouseenter)="hoverItem($event, item)" [routerLink]="[subSubitem.name]">
{{ subSubitem.title }}</a> {{ subSubitem.title }}</a>
</li> </li>

View file

@ -55,7 +55,8 @@ export class SidebarService {
] ]
}]; }];
constructor() { } constructor() {
}
getMenuItems(routes) { getMenuItems(routes) {

View file

@ -1,6 +1,5 @@
@import "sass/conf/conf"; @import "sass/conf/conf";
@import "sass/bootstrap-overrides/overrides"; @import "sass/bootstrap-overrides/overrides";
@import "sass/blur-admin-theme"; @import "sass/blur-admin-theme";
@import "sass/buttons"; @import "sass/buttons";
@import "sass/icons"; @import "sass/icons";