This commit is contained in:
Eugene Pankov
2017-06-01 22:23:36 +02:00
parent c0f7cd9a7a
commit 73722c0b2f
31 changed files with 2946 additions and 589 deletions

View File

@@ -17,7 +17,6 @@
"@types/js-yaml": "^3.5.29",
"@types/node": "^7.0.12",
"@types/webpack-env": "^1.13.0",
"angular2-toaster": "3.0.1",
"awesome-typescript-loader": "^3.1.2",
"bootstrap": "4.0.0-alpha.6",
"core-js": "^2.4.1",

View File

@@ -65,5 +65,4 @@ title-bar(
[scrollable]='tab.scrollable',
)
toaster-container([toasterconfig]="toasterconfig")
ng-template(ngbModalContainer)

View File

@@ -1,6 +1,5 @@
import { Component, Inject, Input } from '@angular/core'
import { trigger, style, animate, transition, state } from '@angular/animations'
import { ToasterConfig } from 'angular2-toaster'
import { ElectronService } from '../services/electron.service'
import { HostAppService, Platform } from '../services/hostApp.service'
@@ -41,7 +40,6 @@ import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
]
})
export class AppRootComponent {
toasterConfig: ToasterConfig
Platform = Platform
@Input() ready = false
@Input() leftToolbarButtons: IToolbarButton[]
@@ -64,12 +62,6 @@ export class AppRootComponent {
this.logger = log.create('main')
this.logger.info('v', electron.app.getVersion())
this.toasterConfig = new ToasterConfig({
mouseoverTimerStop: true,
preventDuplicates: true,
timeout: 4000,
})
this.leftToolbarButtons = this.getToolbarButtons(false)
this.rightToolbarButtons = this.getToolbarButtons(true)

View File

@@ -2,7 +2,6 @@ import { NgModule, ModuleWithProviders } from '@angular/core'
import { BrowserModule } from '@angular/platform-browser'
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { FormsModule } from '@angular/forms'
import { ToasterModule } from 'angular2-toaster'
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'
@@ -55,7 +54,6 @@ const PROVIDERS = [
BrowserModule,
BrowserAnimationsModule,
FormsModule,
ToasterModule,
NgbModule,
PerfectScrollbarModule.forRoot({
suppressScrollX: true,

View File

@@ -50,7 +50,7 @@ $input-bg-focus: $input-bg;
//$input-border-focus: lighten($brand-primary, 25%);
//$input-box-shadow-focus: $input-box-shadow, rgba($input-border-focus, .6);
$input-color-focus: $input-color;
$input-group-addon-bg: $input-bg;
$input-group-addon-bg: $body-bg2;
$input-group-addon-border-color: $input-border-color;
$modal-content-bg: $body-bg;
@@ -69,7 +69,8 @@ $dropdown-link-hover-bg: $body-bg3;
$dropdown-link-disabled-color: #333;
$dropdown-header-color: #333;
$list-group-color: $body-color;
$list-group-bg: $body-bg2;
@import '~bootstrap/scss/bootstrap.scss';