Merge remote-tracking branch 'origin/master'

This commit is contained in:
KostyaDanovsky 2017-09-20 14:42:45 +03:00
commit c9f2b8f0ef
6 changed files with 941 additions and 40 deletions

View file

@ -1,6 +1,6 @@
<nb-card size="medium">
<nb-card-body>
<div class="picture" style.background-image="url('/assets/images/kitten-{{currentTheme}}.png')"></div>
<div class="picture" style.background-image="url('assets/images/kitten-{{currentTheme}}.png')"></div>
<div class="details">
<div class="title">

View file

@ -6,11 +6,11 @@
ngx-room-selector {
width: 70%;
border-right: 2px solid nb-theme(separator);
background: url('/assets/images/square_pattern.svg') repeat;
background: url('~/assets/images/square_pattern.svg') repeat;
background-size: 75px;
@include nb-for-theme(cosmic) {
background-image: url('/assets/images/square_pattern_cosmic.svg');
background-image: url('~/assets/images/square_pattern_cosmic.svg');
}
}

View file

@ -9,16 +9,16 @@ export class SecurityCamerasComponent {
cameras: any[] = [{
title: 'Camera #1',
source: '/assets/images/camera1.jpg',
source: 'assets/images/camera1.jpg',
}, {
title: 'Camera #2',
source: '/assets/images/camera2.jpg',
source: 'assets/images/camera2.jpg',
}, {
title: 'Camera #3',
source: '/assets/images/camera3.jpg',
source: 'assets/images/camera3.jpg',
}, {
title: 'Camera #4',
source: '/assets/images/camera4.jpg',
source: 'assets/images/camera4.jpg',
}];
selectedCamera: any = this.cameras[0];