简柏林 / thingskit · Commits

Commit 9c414a951102362c3d8e7e2e3ed04dcc3a11a6e8

Authored by oleg
1 parent e8620d86

UI. Outsource CSS should be added before custom CSS

Inline Side-by-side
Showing 1 changed file with 14 additions and 14 deletions
@@ -51,6 +51,20 @@ import react from 'ngreact'; @@ -51,6 +51,20 @@ import react from 'ngreact';
51 import '@flowjs/ng-flow/dist/ng-flow-standalone.min'; 51 import '@flowjs/ng-flow/dist/ng-flow-standalone.min';
52 import 'ngFlowchart/dist/ngFlowchart'; 52 import 'ngFlowchart/dist/ngFlowchart';
53 53
  54 +import 'typeface-roboto';
  55 +import 'font-awesome/css/font-awesome.min.css';
  56 +import 'angular-material/angular-material.min.css';
  57 +import 'angular-material-icons/angular-material-icons.css';
  58 +import 'angular-gridster/dist/angular-gridster.min.css';
  59 +import 'v-accordion/dist/v-accordion.min.css';
  60 +import 'md-color-picker/dist/mdColorPicker.min.css';
  61 +import 'mdPickers/dist/mdPickers.min.css';
  62 +import 'angular-hotkeys/build/hotkeys.min.css';
  63 +import 'angular-carousel/dist/angular-carousel.min.css';
  64 +import 'angular-material-expansion-panel/dist/md-expansion-panel.min.css';
  65 +import 'ngFlowchart/dist/flowchart.css';
  66 +import '../scss/main.scss';
  67 +
54 import thingsboardTranslateHandler from './locale/translate-handler'; 68 import thingsboardTranslateHandler from './locale/translate-handler';
55 import thingsboardLogin from './login'; 69 import thingsboardLogin from './login';
56 import thingsboardDialogs from './components/datakey-config-dialog.controller'; 70 import thingsboardDialogs from './components/datakey-config-dialog.controller';
@@ -78,20 +92,6 @@ import thingsboardApiAuditLog from './api/audit-log.service'; @@ -78,20 +92,6 @@ import thingsboardApiAuditLog from './api/audit-log.service';
78 import thingsboardApiComponentDescriptor from './api/component-descriptor.service'; 92 import thingsboardApiComponentDescriptor from './api/component-descriptor.service';
79 import thingsboardApiRuleChain from './api/rule-chain.service'; 93 import thingsboardApiRuleChain from './api/rule-chain.service';
80 94
81 -import 'typeface-roboto';  
82 -import 'font-awesome/css/font-awesome.min.css';  
83 -import 'angular-material/angular-material.min.css';  
84 -import 'angular-material-icons/angular-material-icons.css';  
85 -import 'angular-gridster/dist/angular-gridster.min.css';  
86 -import 'v-accordion/dist/v-accordion.min.css';  
87 -import 'md-color-picker/dist/mdColorPicker.min.css';  
88 -import 'mdPickers/dist/mdPickers.min.css';  
89 -import 'angular-hotkeys/build/hotkeys.min.css';  
90 -import 'angular-carousel/dist/angular-carousel.min.css';  
91 -import 'angular-material-expansion-panel/dist/md-expansion-panel.min.css';  
92 -import 'ngFlowchart/dist/flowchart.css';  
93 -import '../scss/main.scss';  
94 -  
95 import AppConfig from './app.config'; 95 import AppConfig from './app.config';
96 import GlobalInterceptor from './global-interceptor.service'; 96 import GlobalInterceptor from './global-interceptor.service';
97 import AppRun from './app.run'; 97 import AppRun from './app.run';