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

Merge remote-tracking branch 'origin/master'

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
.angular-cli.json
View file

@ -10,6 +10,7 @@
"assets": [ "assets": [
"assets", "assets",
"favicon.ico", "favicon.ico",
"favicon.png",
{ {
"glob": "**/*", "glob": "**/*",
"input": "../node_modules/leaflet/dist/images", "input": "../node_modules/leaflet/dist/images",

960
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

6
src/app/@core/data/player.service.ts
View file

@ -16,19 +16,19 @@ export class PlayerService {
name: 'Don\'t Wanna Fight', name: 'Don\'t Wanna Fight',
artist: 'Alabama Shakes', artist: 'Alabama Shakes',
url: 'https://p.scdn.co/mp3-preview/6156cdbca425a894972c02fca9d76c0b70e001af', url: 'https://p.scdn.co/mp3-preview/6156cdbca425a894972c02fca9d76c0b70e001af',
cover: './assets/images/cover1.jpg', cover: 'assets/images/cover1.jpg',
}, },
{ {
name: 'Harder', name: 'Harder',
artist: 'Daft Punk', artist: 'Daft Punk',
url: 'https://p.scdn.co/mp3-preview/92a04c7c0e96bf93a1b1b1cae7dfff1921969a7b', url: 'https://p.scdn.co/mp3-preview/92a04c7c0e96bf93a1b1b1cae7dfff1921969a7b',
cover: './assets/images/cover2.jpg', cover: 'assets/images/cover2.jpg',
}, },
{ {
name: 'Come Together', name: 'Come Together',
artist: 'Beatles', artist: 'Beatles',
url: 'https://p.scdn.co/mp3-preview/83090a4db6899eaca689ae35f69126dbe65d94c9', url: 'https://p.scdn.co/mp3-preview/83090a4db6899eaca689ae35f69126dbe65d94c9',
cover: './assets/images/cover3.jpg', cover: 'assets/images/cover3.jpg',
}, },
]; ];

2
src/app/pages/dashboard/kitten/kitten.component.html
View file

@ -1,6 +1,6 @@
<nb-card size="medium"> <nb-card size="medium">
<nb-card-body> <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="details">
<div class="title"> <div class="title">

4
src/app/pages/dashboard/rooms/rooms.component.scss
View file

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

8
src/app/pages/dashboard/security-cameras/security-cameras.component.ts
View file

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