github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(build): fix styles

pull/2670/head
Chaim Lev-Ari 2018-10-14 19:45:54 +03:00
parent 6a13b8a677
commit 40fe596e11
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/__module.js
View File

@ -2,8 +2,7 @@ import '../assets/css/vendor.css';
import '../assets/css/app.css'; import '../assets/css/app.css';
import angular from 'angular'; import angular from 'angular';
window.angular = angular;
import 'angular-ui-bootstrap';
import '@uirouter/angularjs'; import '@uirouter/angularjs';
import 'ui-select'; import 'ui-select';
import 'isteven-angular-multiselect/isteven-multi-select.js'; import 'isteven-angular-multiselect/isteven-multi-select.js';
@ -23,6 +22,7 @@ import 'angular-file-saver';
import 'angularjs-scroll-glue'; import 'angularjs-scroll-glue';
import 'angularjs-slider'; import 'angularjs-slider';
import './vendors';
import './agent/_module'; import './agent/_module';
import './azure/_module'; import './azure/_module';
import './docker/__module'; import './docker/__module';

1
app/portainer/components/datatables/genericDatatableController.js
View File

@ -1,4 +1,5 @@
import angular from 'angular'; import angular from 'angular';
import './datatable.css';
angular.module('portainer.app') angular.module('portainer.app')
.controller('GenericDatatableController', ['PaginationService', 'DatatableService', .controller('GenericDatatableController', ['PaginationService', 'DatatableService',

4
app/portainer/services/codeMirror.js
View File

@ -1,6 +1,10 @@
import angular from 'angular'; import angular from 'angular';
import _ from 'lodash'; import _ from 'lodash';
import CodeMirror from 'codemirror'; import CodeMirror from 'codemirror';
import 'codemirror/mode/yaml/yaml.js';
import 'codemirror/addon/lint/lint.js';
import 'codemirror/addon/lint/yaml-lint.js';
import 'codemirror/addon/display/placeholder.js';
angular.module('portainer.app') angular.module('portainer.app')
.factory('CodeMirrorService', function CodeMirrorService() { .factory('CodeMirrorService', function CodeMirrorService() {

4
app/vendors.js
View File

@ -0,0 +1,4 @@
import 'bootstrap/dist/js/bootstrap.js';
import 'js-yaml/dist/js-yaml.js'
import 'angular-ui-bootstrap';

4
assets/css/vendor.css
View File

@ -1,4 +1,3 @@
@import url('../../node_modules/rdash-ui/dist/css/rdash.css');
@import url('../../node_modules/ui-select/dist/select.css'); @import url('../../node_modules/ui-select/dist/select.css');
@import url('../../node_modules/bootstrap/dist/css/bootstrap.css'); @import url('../../node_modules/bootstrap/dist/css/bootstrap.css');
@import url('../../node_modules/isteven-angular-multiselect/isteven-multi-select.css'); @import url('../../node_modules/isteven-angular-multiselect/isteven-multi-select.css');
@ -11,4 +10,5 @@
@import url('../../node_modules/codemirror/lib/codemirror.css'); @import url('../../node_modules/codemirror/lib/codemirror.css');
@import url('../../node_modules/codemirror/addon/lint/lint.css'); @import url('../../node_modules/codemirror/addon/lint/lint.css');
@import url('../../node_modules/angular-json-tree/dist/angular-json-tree.css'); @import url('../../node_modules/angular-json-tree/dist/angular-json-tree.css');
@import url('../../node_modules/angular-loading-bar/build/loading-bar.css'); @import url('../../node_modules/angular-loading-bar/build/loading-bar.css');
@import url('../../node_modules/rdash-ui/dist/css/rdash.css');

9
webpack.config.js
View File

@ -2,6 +2,7 @@ const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin');
const WebpackBuildNotifierPlugin = require('webpack-build-notifier'); const WebpackBuildNotifierPlugin = require('webpack-build-notifier');
const CleanTerminalPlugin = require('clean-terminal-webpack-plugin'); const CleanTerminalPlugin = require('clean-terminal-webpack-plugin');
const { ProvidePlugin } = require('webpack');
module.exports = { module.exports = {
entry: './app/__module.js', entry: './app/__module.js',
@ -58,6 +59,12 @@ module.exports = {
logo: path.resolve('./assets/favicon-32x32.png'), logo: path.resolve('./assets/favicon-32x32.png'),
suppressSuccess: true suppressSuccess: true
}), }),
new CleanTerminalPlugin() new CleanTerminalPlugin(),
new ProvidePlugin({
$: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery',
// angular: 'angular'
})
] ]
}; };