-
+
diff --git a/src/app/pages/tables/components/smartTables/smartTables.scss b/src/app/pages/tables/components/smartTables/smartTables.scss
index 91672f60..7a64b010 100644
--- a/src/app/pages/tables/components/smartTables/smartTables.scss
+++ b/src/app/pages/tables/components/smartTables/smartTables.scss
@@ -1,84 +1,85 @@
@import "../../../../theme/sass/conf/conf";
-.widgets {
- ba-card {
+:host /deep/ .widgets {
+ .smart-table-container {
width: 100%;
}
}
-ng2-smart-table {
- th, td {
- border: 1px solid $border-light !important;
- line-height: 35px;
- vertical-align: middle;
- }
+:host /deep/ {
+ ng2-smart-table {
+ th, td {
+ border: 1px solid $border-light !important;
+ line-height: 35px;
+ vertical-align: middle;
+ }
table tr td {
- padding: 0 8px!important;
- }
+ padding: 0 8px;
+ }
- color: $default-text;
-
- input {
- line-height: 1.5 !important;
- }
-
- ng2-smart-table-cell {
color: $default-text;
- line-height: 35px;
- }
- tbody {
- tr {
+ input {
+ line-height: 1.5 !important;
+ }
+
+ ng2-smart-table-cell {
color: $default-text;
+ line-height: 35px;
}
- tr:hover {
- background: rgba(0, 0, 0, 0.03);
- }
- }
- a.ng2-smart-sort-link {
- font-size: 14px !important;
- color: $default-text;
- font-weight: $font-bolder;
- &.sort {
- font-weight: $font-bolder !important;
-
- &::after {
- border-bottom-color: $default-text !important;
+ tbody {
+ tr {
+ color: $default-text;
+ }
+ tr:hover {
+ background: rgba(0, 0, 0, 0.03);
}
}
- }
- .ng2-smart-actions {
- width: 70px;
- text-align: center;
- .actions {
- float: none;
+ a.ng2-smart-sort-link {
+ font-size: 14px !important;
+ color: $default-text;
+ font-weight: $font-bolder;
+ &.sort {
+ font-weight: $font-bolder !important;
+
+ &::after {
+ border-bottom-color: $default-text !important;
+ }
+ }
+ }
+
+ .ng2-smart-actions {
+ width: 70px;
+ text-align: center;
+ .actions {
+ float: none;
+ text-align: center;
+ }
+ }
+
+ .ng2-smart-actions-title-add {
text-align: center;
}
- }
- .ng2-smart-actions-title-add {
- text-align: center;
- }
+ a.ng2-smart-action, .ng2-smart-title {
+ font-size: 14px !important;
+ color: $default-text;
+ padding: 0 5px;
+ display: inline-block;
- a.ng2-smart-action, .ng2-smart-title {
- font-size: 14px !important;
- color: $default-text;
- padding: 0 5px;
- display: inline-block;
-
- &.ng2-smart-action-add-add {
- font-size: 25px !important;
+ &.ng2-smart-action-add-add {
+ font-size: 25px !important;
+ }
}
- }
- nav.ng2-smart-pagination-nav {
- display: flex;
- justify-content: center;
+ nav.ng2-smart-pagination-nav {
+ display: flex;
+ justify-content: center;
+ }
}
}
-
diff --git a/src/app/pages/ui/components/buttons/buttons.component.ts b/src/app/pages/ui/components/buttons/buttons.component.ts
index aadb2714..fb215358 100644
--- a/src/app/pages/ui/components/buttons/buttons.component.ts
+++ b/src/app/pages/ui/components/buttons/buttons.component.ts
@@ -1,10 +1,9 @@
import {Component} from '@angular/core';
-import 'style-loader!./buttons.scss';
-
@Component({
selector: 'buttons',
templateUrl: './buttons.html',
+ styleUrls: ['./buttons.scss']
})
export class Buttons {
diff --git a/src/app/pages/ui/components/buttons/buttons.scss b/src/app/pages/ui/components/buttons/buttons.scss
index a60e09b1..03fdff25 100644
--- a/src/app/pages/ui/components/buttons/buttons.scss
+++ b/src/app/pages/ui/components/buttons/buttons.scss
@@ -1,134 +1,136 @@
-.basic-btns {
- padding-top: 8px;
- margin-bottom: -8px;
- h5 {
- line-height: 35px;
- font-size: 12px;
- &.row-sm {
- line-height: 30px;
+:host /deep/ .widgets {
+ .basic-btns {
+ padding-top: 8px;
+ margin-bottom: -8px;
+ h5 {
+ line-height: 35px;
+ font-size: 12px;
+ &.row-sm {
+ line-height: 30px;
+ }
+ &.row-xs {
+ line-height: 22px;
+ }
}
- &.row-xs {
- line-height: 22px;
+ & > .row {
+ padding-bottom: 4px;
}
}
- & > .row {
- padding-bottom: 4px;
- }
-}
-.btns-row {
- & > div {
+ .btns-row {
+ & > div {
+ margin-bottom: 12px;
+ }
+ }
+
+ .btns-same-width-sm {
+ .btn {
+ width: 48px;
+ }
+ }
+
+ .btns-same-width-md {
+ .btn {
+ width: 79px;
+ }
+ }
+
+ .btns-same-width-lg {
+ .btn {
+ width: 112px;
+ }
+ }
+
+ ul.btn-list {
+ margin: 0 0 0 -18px;
+ padding: 0;
+ padding-top: 6px;
+ clear: both;
+ li {
+ margin: 0px 0 12px 18px;
+ padding: 0;
+ list-style: none;
+ float: left;
+ }
+ }
+
+ .btn-group-wrapper {
margin-bottom: 12px;
}
-}
-.btns-same-width-sm {
- .btn {
- width: 48px;
- }
-}
-
-.btns-same-width-md {
- .btn {
- width: 79px;
- }
-}
-
-.btns-same-width-lg {
- .btn {
- width: 112px;
- }
-}
-
-ul.btn-list {
- margin: 0 0 0 -18px;
- padding: 0;
- padding-top: 6px;
- clear: both;
- li {
- margin: 0px 0 12px 18px;
+ $btn-icon-size: 34px;
+ .btn-icon {
+ width: $btn-icon-size;
+ height: $btn-icon-size;
+ line-height: $btn-icon-size;
padding: 0;
- list-style: none;
+ text-align: center;
+ }
+
+ .btn-group-example {
+ float: left;
+ margin-right: 30px;
+ margin-bottom: 12px;
+ }
+
+ .btn-toolbar-example {
float: left;
}
-}
-.btn-group-wrapper {
- margin-bottom: 12px;
-}
-
-$btn-icon-size: 34px;
-.btn-icon {
- width: $btn-icon-size;
- height: $btn-icon-size;
- line-height: $btn-icon-size;
- padding: 0;
- text-align: center;
-}
-
-.btn-group-example {
- float: left;
- margin-right: 30px;
- margin-bottom: 12px;
-}
-
-.btn-toolbar-example {
- float: left;
-}
-
-.progress-buttons-container {
- text-align: center;
- font-size: 16px;
- span.button-title {
- display: inline-block;
- width: 100%;
- line-height: 1;
- font-size: 14px;
- margin-bottom: 10px;
- margin-top: 10px;
+ .progress-buttons-container {
+ text-align: center;
+ font-size: 16px;
+ span.button-title {
+ display: inline-block;
+ width: 100%;
+ line-height: 1;
+ font-size: 14px;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ }
+ .row + .row {
+ margin-top: 30px;
+ }
}
- .row + .row {
- margin-top: 30px;
+
+ .button-panel {
+ height: 315px;
+ .btn {
+ width: 150px;
+ }
+ }
+
+ .large-buttons-panel {
+ height: 202px;
+ }
+
+ .button-panel.df-size-button-panel {
+ .btn-xs {
+ width: 60px;
+ }
+ .btn-sm {
+ width: 90px;
+ }
+ .btn-mm {
+ width: 120px;
+ }
+ .btn-md {
+ width: 150px;
+ }
+ .btn-xm {
+ width: 175px;
+ }
+ .btn-lg {
+ width: 200px;
+ }
+ }
+
+ .button-wrapper {
+ text-align: center;
+ margin: 5px 0;
+ }
+
+ .btn-group.flex-dropdown {
+ display: flex;
}
}
-
-.button-panel {
- height: 315px;
- .btn {
- width: 150px;
- }
-}
-
-.large-buttons-panel {
- height: 202px;
-}
-
-.button-panel.df-size-button-panel {
- .btn-xs {
- width: 60px;
- }
- .btn-sm {
- width: 90px;
- }
- .btn-mm {
- width: 120px;
- }
- .btn-md {
- width: 150px;
- }
- .btn-xm {
- width: 175px;
- }
- .btn-lg {
- width: 200px;
- }
-}
-
-.button-wrapper {
- text-align: center;
- margin: 5px 0;
-}
-
-.btn-group.flex-dropdown {
- display: flex;
-}
diff --git a/src/app/pages/ui/components/grid/grid.component.ts b/src/app/pages/ui/components/grid/grid.component.ts
index 555e0c86..dd7fc0a0 100644
--- a/src/app/pages/ui/components/grid/grid.component.ts
+++ b/src/app/pages/ui/components/grid/grid.component.ts
@@ -1,10 +1,9 @@
import {Component} from '@angular/core';
-import 'style-loader!./grid.scss';
-
@Component({
selector: 'grid',
templateUrl: './grid.html',
+ styleUrls: ['./grid.scss']
})
export class Grid {
diff --git a/src/app/pages/ui/components/grid/grid.scss b/src/app/pages/ui/components/grid/grid.scss
index 2a3a4689..9eb09934 100644
--- a/src/app/pages/ui/components/grid/grid.scss
+++ b/src/app/pages/ui/components/grid/grid.scss
@@ -1,6 +1,6 @@
@import '../../../../theme/sass/conf/conf';
-.show-grid div[class^=col-]{
+:host /deep/.show-grid div[class^=col-]{
padding: 10px;
box-sizing: border-box;
div {
@@ -12,7 +12,7 @@
}
}
-.grid-h{
+:host /deep/.grid-h{
margin-top: 40px;
margin-bottom: 0;
&:first-child{
diff --git a/src/app/pages/ui/components/icons/icons.component.ts b/src/app/pages/ui/components/icons/icons.component.ts
index 4dba6154..6e0a74a2 100644
--- a/src/app/pages/ui/components/icons/icons.component.ts
+++ b/src/app/pages/ui/components/icons/icons.component.ts
@@ -2,11 +2,10 @@ import {Component} from '@angular/core';
import {IconsService} from './icons.service';
-import 'style-loader!./icons.scss';
-
@Component({
selector: 'icons',
templateUrl: './icons.html',
+ styleUrls: ['./icons.scss']
})
export class Icons {
diff --git a/src/app/pages/ui/components/icons/icons.scss b/src/app/pages/ui/components/icons/icons.scss
index 817083f8..c6c09991 100644
--- a/src/app/pages/ui/components/icons/icons.scss
+++ b/src/app/pages/ui/components/icons/icons.scss
@@ -1,123 +1,126 @@
@import '../../../../theme/sass/conf/conf';
-@mixin icon-hover($color) {
- i:hover {
- color: $color;
- }
-}
+:host /deep/ .widgets {
-.icons-list {
- & > div {
- text-align: center;
- margin-bottom: 32px;
- }
- i {
- font-weight: $font-normal;
- font-size: 18px;
- cursor: pointer;
+ @mixin icon-hover($color) {
+ i:hover {
+ color: $color;
+ }
}
- &.primary {
- @include icon-hover($primary);
- }
- &.success {
- @include icon-hover($success);
- }
- &.warning {
- @include icon-hover($warning);
- }
- &.danger {
- @include icon-hover($danger);
- }
-}
+ .icons-list {
+ & > div {
+ text-align: center;
+ margin-bottom: 32px;
+ }
+ i {
+ font-weight: $font-normal;
+ font-size: 18px;
+ cursor: pointer;
+ }
-a.see-all-icons {
- float: right;
-}
+ &.primary {
+ @include icon-hover($primary);
+ }
+ &.success {
+ @include icon-hover($success);
+ }
+ &.warning {
+ @include icon-hover($warning);
+ }
+ &.danger {
+ @include icon-hover($danger);
+ }
+ }
-.awesomeIcons {
- height: 308px;
-}
+ a.see-all-icons {
+ float: right;
+ }
-.kameleon-row {
- display: inline-block;
- min-width: 102px;
- width: 20%;
- .kameleon-icon {
- padding: 0 10px;
+ .awesomeIcons {
+ height: 308px;
+ }
+
+ .kameleon-row {
+ display: inline-block;
+ min-width: 102px;
+ width: 20%;
+ .kameleon-icon {
+ padding: 0 10px;
+ img {
+ width: 81px;
+ }
+ }
+ }
+
+ @media (max-width: 750px) {
+ .kameleon-row {
+ width: 25%;
+ }
+ }
+
+ @media (max-width: 550px) {
+ .kameleon-row {
+ width: 33%;
+ }
+ }
+
+ @media (max-width: 430px) {
+ .kameleon-row {
+ width: 50%;
+ }
+ }
+
+ .kameleon-icon-tabs {
+ max-width: 84px;
img {
- width: 81px;
+ width: 100%;
+ min-width: 81px;
+ min-height: 81px;
+ }
+ }
+
+ .kameleon-icon {
+ text-align: center;
+ margin: 0 auto;
+ img {
+ width: 100%;
+ }
+ span {
+ display: block;
+ text-align: center;
+ white-space: nowrap;
+ }
+ }
+
+ @mixin setImgBg($color) {
+ img {
+ background: $color;
+ }
+ }
+
+ .with-round-bg {
+ margin-bottom: 6px;
+ img {
+ border-radius: 50%;
+ margin-bottom: 4px;
+ }
+ @include setImgBg($default);
+
+ &.success {
+ @include setImgBg($success);
+ }
+ &.danger {
+ @include setImgBg($danger);
+ }
+ &.warning {
+ @include setImgBg($warning);
+ }
+ &.info {
+ @include setImgBg($info);
+ }
+ &.primary {
+ @include setImgBg($primary);
}
}
}
-
-@media (max-width: 750px) {
- .kameleon-row {
- width: 25%;
- }
-}
-
-@media (max-width: 550px) {
- .kameleon-row {
- width: 33%;
- }
-}
-
-@media (max-width: 430px) {
- .kameleon-row {
- width: 50%;
- }
-}
-
-.kameleon-icon-tabs {
- max-width: 84px;
- img {
- width: 100%;
- min-width: 81px;
- min-height: 81px;
- }
-}
-
-.kameleon-icon {
- text-align: center;
- margin: 0 auto;
- img {
- width: 100%;
- }
- span {
- display: block;
- text-align: center;
- white-space: nowrap;
- }
-}
-
-@mixin setImgBg($color) {
- img {
- background: $color;
- }
-}
-
-.with-round-bg {
- margin-bottom: 6px;
- img {
- border-radius: 50%;
- margin-bottom: 4px;
- }
- @include setImgBg($default);
-
- &.success {
- @include setImgBg($success);
- }
- &.danger {
- @include setImgBg($danger);
- }
- &.warning {
- @include setImgBg($warning);
- }
- &.info {
- @include setImgBg($info);
- }
- &.primary {
- @include setImgBg($primary);
- }
-}
diff --git a/src/app/theme/components/baAmChart/baAmChart.component.ts b/src/app/theme/components/baAmChart/baAmChart.component.ts
index b653a5e6..f7d56f2a 100644
--- a/src/app/theme/components/baAmChart/baAmChart.component.ts
+++ b/src/app/theme/components/baAmChart/baAmChart.component.ts
@@ -12,11 +12,10 @@ import 'ammap3/ammap/maps/js/worldLow';
import {BaAmChartThemeService} from './baAmChartTheme.service';
-import 'style-loader!./baAmChart.scss';
-
@Component({
selector: 'ba-am-chart',
templateUrl: './baAmChart.html',
+ styleUrls: ['./baAmChart.scss'],
providers: [BaAmChartThemeService],
})
export class BaAmChart {
diff --git a/src/app/theme/components/baChartistChart/baChartistChart.component.ts b/src/app/theme/components/baChartistChart/baChartistChart.component.ts
index 3d18f41c..419dae93 100644
--- a/src/app/theme/components/baChartistChart/baChartistChart.component.ts
+++ b/src/app/theme/components/baChartistChart/baChartistChart.component.ts
@@ -8,7 +8,6 @@ import {
} from '@angular/core';
import * as Chartist from 'chartist';
-import 'style-loader!./baChartistChart.scss';
@Component({
selector: 'ba-chartist-chart',
diff --git a/src/app/theme/components/baChartistChart/baChartistChart.scss b/src/app/theme/components/baChartistChart/baChartistChart.scss
deleted file mode 100644
index 3863db1b..00000000
--- a/src/app/theme/components/baChartistChart/baChartistChart.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "~chartist/dist/chartist";
diff --git a/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts b/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts
index 3f113dd7..6d8fbc2c 100644
--- a/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts
+++ b/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts
@@ -1,12 +1,10 @@
import {Component, ViewChild, Input, Output, ElementRef, EventEmitter} from '@angular/core';
-
import 'fullcalendar/dist/fullcalendar.js';
-
-import 'style-loader!./baFullCalendar.scss';
+import * as jQuery from 'jquery';
@Component({
selector: 'ba-full-calendar',
- templateUrl: './baFullCalendar.html',
+ templateUrl: './baFullCalendar.html'
})
export class BaFullCalendar {
diff --git a/src/app/theme/components/baFullCalendar/baFullCalendar.scss b/src/app/theme/components/baFullCalendar/baFullCalendar.scss
deleted file mode 100644
index 6c51ef8e..00000000
--- a/src/app/theme/components/baFullCalendar/baFullCalendar.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "~fullcalendar/dist/fullcalendar";
diff --git a/src/app/theme/components/baMenu/baMenu.component.ts b/src/app/theme/components/baMenu/baMenu.component.ts
index 7eee2061..fa1b6352 100644
--- a/src/app/theme/components/baMenu/baMenu.component.ts
+++ b/src/app/theme/components/baMenu/baMenu.component.ts
@@ -5,11 +5,10 @@ import { Subscription } from 'rxjs/Rx';
import { BaMenuService } from '../../services';
import { GlobalState } from '../../../global.state';
-import 'style-loader!./baMenu.scss';
-
@Component({
selector: 'ba-menu',
- templateUrl: './baMenu.html'
+ templateUrl: './baMenu.html',
+ styleUrls: ['./baMenu.scss']
})
export class BaMenu {
diff --git a/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.component.ts b/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.component.ts
index 8a949583..c0ba578a 100644
--- a/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.component.ts
+++ b/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.component.ts
@@ -1,10 +1,9 @@
import {Component, Input, Output, EventEmitter} from '@angular/core';
-import 'style-loader!./baMenuItem.scss';
-
@Component({
selector: 'ba-menu-item',
- templateUrl: './baMenuItem.html'
+ templateUrl: './baMenuItem.html',
+ styleUrls: ['./baMenuItem.scss']
})
export class BaMenuItem {
diff --git a/src/app/theme/components/baPageTop/baPageTop.component.ts b/src/app/theme/components/baPageTop/baPageTop.component.ts
index 663787d2..7b26ef91 100644
--- a/src/app/theme/components/baPageTop/baPageTop.component.ts
+++ b/src/app/theme/components/baPageTop/baPageTop.component.ts
@@ -2,11 +2,10 @@ import {Component} from '@angular/core';
import {GlobalState} from '../../../global.state';
-import 'style-loader!./baPageTop.scss';
-
@Component({
selector: 'ba-page-top',
templateUrl: './baPageTop.html',
+ styleUrls: ['./baPageTop.scss']
})
export class BaPageTop {
diff --git a/src/app/theme/components/baPageTop/baPageTop.scss b/src/app/theme/components/baPageTop/baPageTop.scss
index 46c71d46..0e7cbdae 100644
--- a/src/app/theme/components/baPageTop/baPageTop.scss
+++ b/src/app/theme/components/baPageTop/baPageTop.scss
@@ -1,200 +1,202 @@
@import '../../sass/conf/conf';
@import '../../components/baMsgCenter/baMsgCenter';
-.page-top {
- background-color: $sidebar;
- position: fixed;
- z-index: 904;
- box-shadow: 2px 0 3px rgba(0, 0, 0, 0.5);
- height: 66px;
- width: 100%;
- min-width: $resMin;
- padding: 0 32px 0 40px;
+:host /deep/ {
- .dropdown-toggle::after {
- display: none;
+ .page-top {
+ background-color: $sidebar;
+ position: fixed;
+ z-index: 904;
+ box-shadow: 2px 0 3px rgba(0, 0, 0, 0.5);
+ height: 66px;
+ width: 100%;
+ min-width: $resMin;
+ padding: 0 32px 0 40px;
+
+ .dropdown-toggle::after {
+ display: none;
+ }
}
-}
-.blur {
- .page-top.scrolled {
- background-color: rgba(black, 0.85)
+ .blur {
+ .page-top.scrolled {
+ background-color: rgba(black, 0.85)
+ }
}
-}
-a.al-logo {
- color: $sidebar-text;
- display: block;
- font-size: 24px;
- font-family: $font-family;
- white-space: nowrap;
- float: left;
- outline: none !important;
- line-height: 60px;
+ a.al-logo {
+ color: $sidebar-text;
+ display: block;
+ font-size: 24px;
+ font-family: $font-family;
+ white-space: nowrap;
+ float: left;
+ outline: none !important;
+ line-height: 60px;
- span {
+ span {
+ color: $primary;
+ }
+ }
+
+ a.al-logo:hover {
color: $primary;
}
-}
-a.al-logo:hover {
- color: $primary;
-}
-
-.user-profile {
- float: right;
- min-width: 230px;
- margin-top: 10px;
-}
-
-.al-user-profile {
- float: right;
- margin-right: 12px;
- transition: all .15s ease-in-out;
- padding: 0;
- width: 36px;
- height: 36px;
- border: 0;
- opacity: 1;
- position: relative;
- ul.profile-dropdown:after {
- bottom: 100%;
- right: 0;
- border: solid transparent;
- content: " ";
- height: 0;
- width: 0;
- position: absolute;
- pointer-events: none;
- border-color: rgba(255, 255, 255, 0);
- border-bottom-color: #fff;
- border-width: 10px;
- margin-right: 28px;
+ .user-profile {
+ float: right;
+ min-width: 230px;
+ margin-top: 10px;
}
- a {
- display: block;
- }
- img {
- width: 45px;
- height: 45px;
- border-radius: 50%;
- }
-}
-a.refresh-data {
- color: $sidebar-text;
- font-size: 13px;
- text-decoration: none;
- font-weight: $font-normal;
- float: right;
- margin-top: 13px;
- margin-right: 26px;
-
- &:hover {
- color: $warning !important;
- }
-}
-
-a.collapse-menu-link {
- font-size: 31px;
- cursor: pointer;
- display: block;
- text-decoration: none;
- line-height: 42px;
- color: $sidebar-text;
- padding: 0;
- float: left;
- margin: 11px 0 0 25px;
-
- &:hover {
- text-decoration: none;
- color: $warning;
- }
-}
-
-.al-skin-dropdown {
- float: right;
- margin-top: 14px;
- margin-right: 26px;
-
- .tpl-skin-panel {
- max-height: 300px;
- overflow-y: scroll;
- overflow-x: hidden;
- }
-}
-
-.icon-palette {
- display: inline-block;
- width: 14px;
- height: 13px;
- @include bg('theme/palette.png');
- background-size: cover;
-}
-
-.search {
- text-shadow: none;
- font-size: 13px;
- line-height: 25px;
- transition: all 0.5s ease;
- white-space: nowrap;
- overflow: hidden;
- width: 162px;
- float: left;
- margin: 20px 0 0 30px;
-
- label {
- cursor: pointer;
- }
- i {
- width: 16px;
- display: inline-block;
- cursor: pointer;
- padding-left: 1px;
- font-size: 16px;
- margin-right: 13px;
- }
- input {
- color: $sidebar-text;
- background: none;
- border: none;
- outline: none;
- width: 120px;
+ .al-user-profile {
+ float: right;
+ margin-right: 12px;
+ transition: all .15s ease-in-out;
padding: 0;
- margin: 0 0 0 -3px;
- height: 27px;
+ width: 36px;
+ height: 36px;
+ border: 0;
+ opacity: 1;
+ position: relative;
+ ul.profile-dropdown:after {
+ bottom: 100%;
+ right: 0;
+ border: solid transparent;
+ content: " ";
+ height: 0;
+ width: 0;
+ position: absolute;
+ pointer-events: none;
+ border-color: rgba(255, 255, 255, 0);
+ border-bottom-color: #fff;
+ border-width: 10px;
+ margin-right: 28px;
+ }
+ a {
+ display: block;
+ }
+ img {
+ width: 45px;
+ height: 45px;
+ border-radius: 50%;
+ }
}
-}
-@media screen and (max-width: $resS) {
- .search {
- display: none;
- }
-}
-
-@media screen and (max-width: $resXS) {
- .page-top {
- padding: 0 20px;
- }
-}
-
-@media (max-width: $resXXS) {
- .user-profile{
- min-width: 136px;
- }
a.refresh-data {
- margin-right: 10px;
+ color: $sidebar-text;
+ font-size: 13px;
+ text-decoration: none;
+ font-weight: $font-normal;
+ float: right;
+ margin-top: 13px;
+ margin-right: 26px;
+
+ &:hover {
+ color: $warning !important;
+ }
}
+
a.collapse-menu-link {
- margin-left: 10px;
+ font-size: 31px;
+ cursor: pointer;
+ display: block;
+ text-decoration: none;
+ line-height: 42px;
+ color: $sidebar-text;
+ padding: 0;
+ float: left;
+ margin: 11px 0 0 25px;
+
+ &:hover {
+ text-decoration: none;
+ color: $warning;
+ }
}
.al-skin-dropdown {
- display: none;
+ float: right;
+ margin-top: 14px;
+ margin-right: 26px;
+
+ .tpl-skin-panel {
+ max-height: 300px;
+ overflow-y: scroll;
+ overflow-x: hidden;
+ }
+ }
+
+ .icon-palette {
+ display: inline-block;
+ width: 14px;
+ height: 13px;
+ @include bg('theme/palette.png');
+ background-size: cover;
+ }
+
+ .search {
+ text-shadow: none;
+ font-size: 13px;
+ line-height: 25px;
+ transition: all 0.5s ease;
+ white-space: nowrap;
+ overflow: hidden;
+ width: 162px;
+ float: left;
+ margin: 20px 0 0 30px;
+
+ label {
+ cursor: pointer;
+ }
+ i {
+ width: 16px;
+ display: inline-block;
+ cursor: pointer;
+ padding-left: 1px;
+ font-size: 16px;
+ margin-right: 13px;
+ }
+ input {
+ color: $sidebar-text;
+ background: none;
+ border: none;
+ outline: none;
+ width: 120px;
+ padding: 0;
+ margin: 0 0 0 -3px;
+ height: 27px;
+ }
+ }
+
+ @media screen and (max-width: $resS) {
+ .search {
+ display: none;
+ }
+ }
+
+ @media screen and (max-width: $resXS) {
+ .page-top {
+ padding: 0 20px;
+ }
+ }
+
+ @media (max-width: $resXXS) {
+ .user-profile {
+ min-width: 136px;
+ }
+ a.refresh-data {
+ margin-right: 10px;
+ }
+ a.collapse-menu-link {
+ margin-left: 10px;
+ }
+
+ .al-skin-dropdown {
+ display: none;
+ }
+ }
+
+ .profile-toggle-link {
+ cursor: pointer;
}
}
-
-.profile-toggle-link{
- cursor: pointer;
-}
-
diff --git a/src/app/theme/components/baSidebar/baSidebar.component.ts b/src/app/theme/components/baSidebar/baSidebar.component.ts
index c80e1ee6..bd632eaa 100644
--- a/src/app/theme/components/baSidebar/baSidebar.component.ts
+++ b/src/app/theme/components/baSidebar/baSidebar.component.ts
@@ -2,11 +2,10 @@ import {Component, ElementRef, HostListener} from '@angular/core';
import {GlobalState} from '../../../global.state';
import {layoutSizes} from '../../../theme';
-import 'style-loader!./baSidebar.scss';
-
@Component({
selector: 'ba-sidebar',
- templateUrl: './baSidebar.html'
+ templateUrl: './baSidebar.html',
+ styleUrls: ['./baSidebar.scss']
})
export class BaSidebar {
public menuHeight:number;
diff --git a/src/app/theme/components/baSidebar/baSidebar.scss b/src/app/theme/components/baSidebar/baSidebar.scss
index 29920784..b042835f 100644
--- a/src/app/theme/components/baSidebar/baSidebar.scss
+++ b/src/app/theme/components/baSidebar/baSidebar.scss
@@ -4,300 +4,303 @@ $sidebar-scroll-width: 4px;
$angle-left: "\f100";
$angle-right: "\f101";
-.al-sidebar {
- width: $sidebar-width;
- top: $top-height;
- left: 0;
- z-index: 1001;
- display: block;
- min-height: 100%;
- background-color: $sidebar;
- height: 100%;
- position: fixed;
-}
+:host /deep/{
-.al-sidebar-list {
- margin: 0;
- overflow: hidden;
- padding: 18px 0 0 0;
- list-style: none;
-}
-
-.al-sidebar-sublist .subitem-submenu-list {
- padding-left: 15px;
-}
-
-.subitem-submenu-link {
- .fa {
- top: 7px;
- }
-}
-
-.al-sidebar-list-item {
- display: block;
- position: relative;
- float: none;
- padding: 0;
- &.selected:not(.with-sub-menu) {
- background-color: $primary;
- a.al-sidebar-list-link {
- color: $sidebar-text;
- b {
- color: $sidebar-text;
- }
- }
- }
-}
-
-.ba-sidebar-item-expanded {
- > ul.al-sidebar-sublist {
- display: block!important;
- }
-
-}
-
-.al-sidebar-list-item, .ba-sidebar-sublist-item {
- &.ba-sidebar-item-expanded {
- > .al-sidebar-list-link {
- b {
- transform: rotate(180deg);
- }
- }
-
- > .al-sidebar-sublist {
- display: block;
- }
- }
-}
-
-a.al-sidebar-list-link {
- display: block;
- height: 42px;
- padding-left: 18px;
- text-shadow: none;
- font-size: 13px;
- text-decoration: none;
- color: $sidebar-text;
- line-height: 42px;
- white-space: nowrap;
- overflow: hidden;
- cursor: pointer;
- &:hover {
- color: $primary;
- b {
- color: $primary;
- }
- }
- i {
- margin-right: 18px;
- width: 16px;
- display: inline-block;
- }
- b {
+ .al-sidebar {
+ width: $sidebar-width;
+ top: $top-height;
+ left: 0;
+ z-index: 1001;
display: block;
- opacity: 1;
- width: 14px;
- height: 14px;
- line-height: 14px;
- text-shadow: none;
- font-size: 18px;
- position: absolute;
- right: 10px;
- top: 12px;
- padding: 0;
- text-align: center;
- color: $sidebar-text;
- transition: transform 0.2s linear;
- }
-}
-
-.slimScrollBar, .slimScrollRail {
- border-radius: 0px !important;
- width: $sidebar-scroll-width !important;
- left: $sidebar-width - $sidebar-scroll-width;
-}
-
-@mixin layout-collapsed() {
- .al-main {
- margin-left: 50px;
+ min-height: 100%;
+ background-color: $sidebar;
+ height: 100%;
+ position: fixed;
}
- .al-footer {
- padding-left: 83px
+ .al-sidebar-list {
+ margin: 0;
+ overflow: hidden;
+ padding: 18px 0 0 0;
+ list-style: none;
}
-}
-@mixin default-sublist() {
- padding: 0;
- list-style: none;
- position: relative;
- display: none;
- &.expanded {
- display: block;
- }
- > ba-menu-item > li {
+ .al-sidebar-sublist .subitem-submenu-list {
+ padding-left: 15px;
+ }
+
+ .subitem-submenu-link {
+ .fa {
+ top: 7px;
+ }
+ }
+
+ .al-sidebar-list-item {
display: block;
+ position: relative;
float: none;
padding: 0;
- border-bottom: none;
- position: relative;
- a {
- display: block;
- text-shadow: none;
- font-size: 13px;
- text-decoration: none;
- color: $sidebar-text;
- padding-left: 52px;
- height: auto;
- line-height: 29px;
- &:hover {
+ &.selected:not(.with-sub-menu) {
+ background-color: $primary;
+ a.al-sidebar-list-link {
+ color: $sidebar-text;
+ b {
+ color: $sidebar-text;
+ }
+ }
+ }
+ }
+
+ .ba-sidebar-item-expanded {
+ > ul.al-sidebar-sublist {
+ display: block !important;
+ }
+
+ }
+
+ .al-sidebar-list-item, .ba-sidebar-sublist-item {
+ &.ba-sidebar-item-expanded {
+ > .al-sidebar-list-link {
+ b {
+ transform: rotate(180deg);
+ }
+ }
+
+ > .al-sidebar-sublist {
+ display: block;
+ }
+ }
+ }
+
+ a.al-sidebar-list-link {
+ display: block;
+ height: 42px;
+ padding-left: 18px;
+ text-shadow: none;
+ font-size: 13px;
+ text-decoration: none;
+ color: $sidebar-text;
+ line-height: 42px;
+ white-space: nowrap;
+ overflow: hidden;
+ cursor: pointer;
+ &:hover {
+ color: $primary;
+ b {
color: $primary;
}
}
- &.selected:not(.with-sub-menu) > a {
- border: none;
- background-color: $primary;
- &:hover {
- color: $sidebar-text;
- }
+ i {
+ margin-right: 18px;
+ width: 16px;
+ display: inline-block;
}
-
- }
-}
-
-.al-sidebar-sublist {
- @include default-sublist();
-}
-
-.sidebar-hover-elem{
- width: $sidebar-scroll-width;
- background: $primary;
- position: absolute;
- top: -150px;
- left: $sidebar-width - $sidebar-scroll-width;
- transition: all 0.5s ease;
- transition-property: top, height;
- height: 42px;
- display: block;
-}
-
-.sidebar-select-elem {
- display: block;
- top: 94px;
-}
-
-@mixin sidebar-collapsed() {
- .al-sidebar {
- width: 52px;
-
- .fa-angle-down, .fa-angle-up {
- opacity: 0;
- }
-
- .al-sidebar-sublist {
- position: absolute;
- top: -1px;
- left: 52px;
- @include bg-translucent-dark(0.8);
- width: 0;
+ b {
display: block;
- overflow: hidden;
- transition: width 0.5s ease;
- &.slide-right {
- width: 135px;
+ opacity: 1;
+ width: 14px;
+ height: 14px;
+ line-height: 14px;
+ text-shadow: none;
+ font-size: 18px;
+ position: absolute;
+ right: 10px;
+ top: 12px;
+ padding: 0;
+ text-align: center;
+ color: $sidebar-text;
+ transition: transform 0.2s linear;
+ }
+ }
+
+ .slimScrollBar, .slimScrollRail {
+ border-radius: 0px !important;
+ width: $sidebar-scroll-width !important;
+ left: $sidebar-width - $sidebar-scroll-width;
+ }
+
+ @mixin layout-collapsed() {
+ .al-main {
+ margin-left: 50px;
+ }
+
+ .al-footer {
+ padding-left: 83px
+ }
+ }
+
+ @mixin default-sublist() {
+ padding: 0;
+ list-style: none;
+ position: relative;
+ display: none;
+ &.expanded {
+ display: block;
+ }
+ > ba-menu-item > li {
+ display: block;
+ float: none;
+ padding: 0;
+ border-bottom: none;
+ position: relative;
+ a {
+ display: block;
+ text-shadow: none;
+ font-size: 13px;
+ text-decoration: none;
+ color: $sidebar-text;
+ padding-left: 52px;
+ height: auto;
+ line-height: 29px;
+ &:hover {
+ color: $primary;
+ }
}
- &:before {
- display: none;
+ &.selected:not(.with-sub-menu) > a {
+ border: none;
+ background-color: $primary;
+ &:hover {
+ color: $sidebar-text;
+ }
}
- li {
+
+ }
+ }
+
+ .al-sidebar-sublist {
+ @include default-sublist();
+ }
+
+ .sidebar-hover-elem {
+ width: $sidebar-scroll-width;
+ background: $primary;
+ position: absolute;
+ top: -150px;
+ left: $sidebar-width - $sidebar-scroll-width;
+ transition: all 0.5s ease;
+ transition-property: top, height;
+ height: 42px;
+ display: block;
+ }
+
+ .sidebar-select-elem {
+ display: block;
+ top: 94px;
+ }
+
+ @mixin sidebar-collapsed() {
+ .al-sidebar {
+ width: 52px;
+
+ .fa-angle-down, .fa-angle-up {
+ opacity: 0;
+ }
+
+ .al-sidebar-sublist {
+ position: absolute;
+ top: -1px;
+ left: 52px;
+ @include bg-translucent-dark(0.8);
+ width: 0;
+ display: block;
+ overflow: hidden;
+ transition: width 0.5s ease;
+ &.slide-right {
+ width: 135px;
+ }
&:before {
display: none;
}
- a {
- padding-left: 18px;
- padding-right: 18px;
- min-width: 130px;
- white-space: nowrap;
+ li {
+ &:before {
+ display: none;
+ }
+ a {
+ padding-left: 18px;
+ padding-right: 18px;
+ min-width: 130px;
+ white-space: nowrap;
+ }
}
}
- }
+ .sidebar-hover-elem, .sidebar-select-elem {
+ left: 48px;
+ }
+ }
+ }
+
+ @mixin sidebar-hidden() {
+ .al-sidebar {
+ width: 0;
+ }
.sidebar-hover-elem, .sidebar-select-elem {
- left: 48px;
+ display: none;
}
}
-}
-@mixin sidebar-hidden() {
- .al-sidebar {
- width: 0;
- }
- .sidebar-hover-elem, .sidebar-select-elem {
- display: none;
- }
-}
+ @mixin sidebar-overlap() {
+ .al-sidebar {
+ width: $sidebar-width;
+ @include bg-translucent-dark(0.75);
+ transition: width 0.5s ease;
-@mixin sidebar-overlap() {
- .al-sidebar {
- width: $sidebar-width;
- @include bg-translucent-dark(0.75);
- transition: width 0.5s ease;
+ .fa-angle-down, .fa-angle-up {
+ opacity: 1;
+ }
- .fa-angle-down, .fa-angle-up {
- opacity: 1;
- }
+ .al-sidebar-sublist {
+ @include default-sublist();
+ top: auto;
+ left: auto;
+ background: none;
+ width: auto;
+ overflow: visible;
+ transition: none;
+ }
- .al-sidebar-sublist {
- @include default-sublist();
- top: auto;
- left: auto;
- background: none;
- width: auto;
- overflow: visible;
- transition: none;
- }
-
- .sidebar-hover-elem, .sidebar-select-elem {
- left: $sidebar-width - 4;
- transition: left 0.5s ease;
+ .sidebar-hover-elem, .sidebar-select-elem {
+ left: $sidebar-width - 4;
+ transition: left 0.5s ease;
+ }
}
}
-}
-.menu-collapsed {
- .slimScrollBar, .slimScrollRail {
- display: none!important;
- }
-}
-
-@media (min-width: 1200px) {
.menu-collapsed {
+ .slimScrollBar, .slimScrollRail {
+ display: none !important;
+ }
+ }
+
+ @media (min-width: 1200px) {
+ .menu-collapsed {
+ @include layout-collapsed();
+ }
+ }
+
+ @media (min-width: $resXS + 1) {
+ .menu-collapsed {
+ @include sidebar-collapsed();
+ }
+ }
+
+ @media (max-width: 1200px) and (min-width: $resXS) {
@include layout-collapsed();
}
-}
-@media (min-width: $resXS + 1) {
- .menu-collapsed {
- @include sidebar-collapsed();
- }
-}
-
-@media (max-width: 1200px) and (min-width: $resXS) {
- @include layout-collapsed();
-}
-
-@media (max-width: 1200px) {
- @include sidebar-overlap();
-}
-
-@media (max-width: $resXS) {
- .menu-collapsed {
- @include sidebar-hidden();
- }
- .al-main {
- margin-left: 0;
- }
- .al-footer {
- padding-left: 0;
+ @media (max-width: 1200px) {
+ @include sidebar-overlap();
+ }
+
+ @media (max-width: $resXS) {
+ .menu-collapsed {
+ @include sidebar-hidden();
+ }
+ .al-main {
+ margin-left: 0;
+ }
+ .al-footer {
+ padding-left: 0;
+ }
}
}
diff --git a/src/app/theme/sass/_icons.scss b/src/app/theme/sass/_icons.scss
index 40b8d264..76456977 100644
--- a/src/app/theme/sass/_icons.scss
+++ b/src/app/theme/sass/_icons.scss
@@ -13,7 +13,7 @@
@mixin svg-icon-class($iconName, $width:'', $height:'') {
.#{'i-' + $iconName} {
- @include svg-icon($images-root + $iconName + '.svg', $width, $height);
+ @include svg-icon('/assets/img/' + $iconName + '.svg', $width, $height);
}
}
diff --git a/src/app/theme/sass/_layout.scss b/src/app/theme/sass/_layout.scss
index df07d1c0..df4b2a75 100644
--- a/src/app/theme/sass/_layout.scss
+++ b/src/app/theme/sass/_layout.scss
@@ -160,11 +160,12 @@ a {
}
.icon-up {
- @include bg-nr('arrow-green-up.svg');
+ //@include bg-nr('arrow-green-up.svg');
+ background: url('/assets/img/arrow-green-up.svg') no-repeat 0 0;
}
.icon-down {
- @include bg-nr('arrow-red-down.svg');
+ background: url('/assets/img/arrow-red-down.svg') no-repeat 0 0;
}
.disable-text-selection {
diff --git a/src/app/theme/sass/_socicon.scss b/src/app/theme/sass/_socicon.scss
index 927bed8f..5376aa7d 100644
--- a/src/app/theme/sass/_socicon.scss
+++ b/src/app/theme/sass/_socicon.scss
@@ -1,11 +1,11 @@
@font-face {
font-family: 'socicon';
- src: url('#{$fonts-root}socicon.eot');
- src: url('#{$fonts-root}socicon.eot?#iefix') format('embedded-opentype'),
- url('#{$fonts-root}socicon.woff') format('woff'),
- url('#{$fonts-root}socicon.woff2') format('woff2'),
- url('#{$fonts-root}socicon.ttf') format('truetype'),
- url('#{$fonts-root}socicon.svg#sociconregular') format('svg');
+ src: url('/assets#{$fonts-root}socicon.eot');
+ src: url('/assets#{$fonts-root}socicon.eot?#iefix') format('embedded-opentype'),
+ url('/assets#{$fonts-root}socicon.woff') format('woff'),
+ url('/assets#{$fonts-root}socicon.woff2') format('woff2'),
+ url('/assets#{$fonts-root}socicon.ttf') format('truetype'),
+ url('/assets#{$fonts-root}socicon.svg#sociconregular') format('svg');
font-weight: $font-normal;
font-style: normal;
text-transform: initial;
@@ -67,4 +67,4 @@
.socicon-behace {
@include socicon($behace-color, "H");
-}
\ No newline at end of file
+}
diff --git a/src/app/theme/sass/bootstrap-overrides/_card.scss b/src/app/theme/sass/bootstrap-overrides/_card.scss
index 40be447f..d18f0b85 100644
--- a/src/app/theme/sass/bootstrap-overrides/_card.scss
+++ b/src/app/theme/sass/bootstrap-overrides/_card.scss
@@ -2,7 +2,7 @@ $card-title-height: 44px;
$card-header-font-size: 16px;
.card.card-blur {
- $blurredBgUrl: $images-root + 'blur-bg-blurred.jpg';
+ $blurredBgUrl: '/img/blur-bg-blurred.jpg';
background: url($blurredBgUrl);
transition: none;
background-attachment: fixed;
diff --git a/src/app/theme/sass/conf/_mixins.scss b/src/app/theme/sass/conf/_mixins.scss
index 37be10e8..ab21db06 100644
--- a/src/app/theme/sass/conf/_mixins.scss
+++ b/src/app/theme/sass/conf/_mixins.scss
@@ -46,7 +46,7 @@
}
@mixin bg-image($relativeUrl) {
- background-image: url($images-root + $relativeUrl);
+ background-image: url($assets-root + $images-root + $relativeUrl);
}
@mixin bg-translucent-dark($opacity) {
diff --git a/src/app/theme/sass/conf/_variables.scss b/src/app/theme/sass/conf/_variables.scss
index 32111079..d58e3a5f 100644
--- a/src/app/theme/sass/conf/_variables.scss
+++ b/src/app/theme/sass/conf/_variables.scss
@@ -21,9 +21,9 @@ $large-card-height: 974px;
$default-animation-duration: 0.2s;
$default-animation-style: ease-out;
-$assets-root: 'assets/';
-$images-root: $assets-root + 'img/';
-$fonts-root: $assets-root + 'fonts/';
+$assets-root: '/assets';
+$images-root: '/img/';
+$fonts-root: '/fonts/';
$font-thin: 100;
$font-light: 300;
$font-normal: 400;
diff --git a/src/app/theme/sass/conf/colorSchemes/_ng2.scss b/src/app/theme/sass/conf/colorSchemes/_ng2.scss
index 1d895829..859166dd 100644
--- a/src/app/theme/sass/conf/colorSchemes/_ng2.scss
+++ b/src/app/theme/sass/conf/colorSchemes/_ng2.scss
@@ -65,7 +65,7 @@ $hoverlink: darken($activelink, 20%);
@mixin body-bg() {
background-color: $body-bg;
- $mainBgUrl: $images-root + 'sky-bg.jpg';
+ $mainBgUrl: $assets-root + $images-root + 'sky-bg.jpg';
&::before {
content: '';
diff --git a/src/custom-typings.d.ts b/src/custom-typings.d.ts
deleted file mode 100644
index 80388d64..00000000
--- a/src/custom-typings.d.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Custom Type Definitions
- * When including 3rd party modules you also need to include the type definition for the module
- * if they don't provide one within the module. You can try to install it with @types
- npm install @types/node
- npm install @types/lodash
- * If you can't find the type definition in the registry we can make an ambient/global definition in
- * this file for now. For example
- declare module 'my-module' {
- export function doesSomething(value: string): string;
- }
- * If you are using a CommonJS module that is using module.exports then you will have to write your
- * types using export = yourObjectOrFunction with a namespace above it
- * notice how we have to create a namespace that is equal to the function we're assigning the export to
- declare module 'jwt-decode' {
- function jwtDecode(token: string): any;
- namespace jwtDecode {}
- export = jwtDecode;
- }
- *
- * If you're prototying and you will fix the types later you can also declare it as type any
- *
- declare var assert: any;
- declare var _: any;
- declare var $: any;
- *
- * If you're importing a module that uses Node.js modules which are CommonJS you need to import as
- * in the files such as main.browser.ts or any file within app/
- *
- import * as _ from 'lodash'
- * You can include your type definitions in this file until you create one for the @types
- *
- */
-
-interface JQuery {
- easyPieChart;
-}
-
-declare var GoogleMapsLoader:any;
-declare var L:any;
-declare var AmCharts:any;
-declare var Chart:any;
-declare var Chartist:any;
-
-// support NodeJS modules without type definitions
-declare module '*';
-
-// Extra variables that live on Global that will be replaced by webpack DefinePlugin
-declare var ENV: string;
-declare var HMR: boolean;
-declare var System: SystemJS;
-
-interface SystemJS {
- import: (path?: string) => Promise
;
-}
-
-interface GlobalEnvironment {
- ENV: string;
- HMR: boolean;
- SystemJS: SystemJS;
- System: SystemJS;
-}
-
-interface Es6PromiseLoader {
- (id: string): (exportName?: string) => Promise;
-}
-
-type FactoryEs6PromiseLoader = () => Es6PromiseLoader;
-type FactoryPromise = () => Promise;
-
-type AsyncRoutes = {
- [component: string]: Es6PromiseLoader |
- Function |
- FactoryEs6PromiseLoader |
- FactoryPromise
-};
-
-
-type IdleCallbacks = Es6PromiseLoader |
- Function |
- FactoryEs6PromiseLoader |
- FactoryPromise ;
-
-interface WebpackModule {
- hot: {
- data?: any,
- idle: any,
- accept(dependencies?: string | string[], callback?: (updatedDependencies?: any) => void): void;
- decline(deps?: any | string | string[]): void;
- dispose(callback?: (data?: any) => void): void;
- addDisposeHandler(callback?: (data?: any) => void): void;
- removeDisposeHandler(callback?: (data?: any) => void): void;
- check(autoApply?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void;
- apply(options?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void;
- status(callback?: (status?: string) => void): void | string;
- removeStatusHandler(callback?: (status?: string) => void): void;
- };
-}
-
-
-interface WebpackRequire {
- (id: string): any;
- (paths: string[], callback: (...modules: any[]) => void): void;
- ensure(ids: string[], callback: (req: WebpackRequire) => void, chunkName?: string): void;
- context(directory: string, useSubDirectories?: boolean, regExp?: RegExp): WebpackContext;
-}
-
-interface WebpackContext extends WebpackRequire {
- keys(): string[];
-}
-
-interface ErrorStackTraceLimit {
- stackTraceLimit: number;
-}
-
-
-// Extend typings
-interface NodeRequire extends WebpackRequire {}
-interface ErrorConstructor extends ErrorStackTraceLimit {}
-interface NodeRequireFunction extends Es6PromiseLoader {}
-interface NodeModule extends WebpackModule {}
-interface Global extends GlobalEnvironment {}
diff --git a/src/desktop.ts b/src/desktop.ts
deleted file mode 100644
index 67267913..00000000
--- a/src/desktop.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { app, BrowserWindow } from 'electron';
-
-let win: Electron.BrowserWindow;
-
-function createWindow () {
- // Create the browser window.
- win = new BrowserWindow({width: 800, height: 600});
-
- // and load the index.html of the app.
- win.loadURL(`file://${__dirname}/index.html`);
-
- // Open the DevTools.
- // win.webContents.openDevTools();
-
- // Emitted when the window is closed.
- win.on('closed', () => {
- // Dereference the window object, usually you would store windows
- // in an array if your app supports multi windows, this is the time
- // when you should delete the corresponding element.
- win = null;
- });
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow);
-
-// Quit when all windows are closed.
-app.on('window-all-closed', () => {
- // On macOS it is common for applications and their menu bar
- // to stay active until the user quits explicitly with Cmd + Q
- if (process.platform !== 'darwin') {
- app.quit();
- }
-});
-
-app.on('activate', () => {
- // On macOS it's common to re-create a window in the app when the
- // dock icon is clicked and there are no other windows open.
- if (win === null) {
- createWindow();
- }
-});
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
new file mode 100644
index 00000000..c9669790
--- /dev/null
+++ b/src/environments/environment.prod.ts
@@ -0,0 +1,3 @@
+export const environment = {
+ production: true,
+};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
new file mode 100644
index 00000000..cf6bba0d
--- /dev/null
+++ b/src/environments/environment.ts
@@ -0,0 +1,8 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+ production: false,
+};
diff --git a/src/favicon.ico b/src/favicon.ico
new file mode 100644
index 00000000..8081c7ce
Binary files /dev/null and b/src/favicon.ico differ
diff --git a/src/index.html b/src/index.html
index 2d3b315e..70f110be 100644
--- a/src/index.html
+++ b/src/index.html
@@ -5,18 +5,18 @@
- <%= htmlWebpackPlugin.options.title %>
+
+ ng2-admin
-
+
- <% if (webpackConfig.htmlElements.headTags) { %>
-
- <%= webpackConfig.htmlElements.headTags %>
- <% } %>
+
+
+
+
-
-
+
@@ -28,10 +28,10 @@
-<% if (htmlWebpackPlugin.options.metadata.isDevServer && htmlWebpackPlugin.options.metadata.HMR !== true) { %>
-
-
-<% } %>
+
+
+
+