Browse Source

Merge pull request #2765 from break60/dev-1.3.0

delete normalize
pull/3/MERGE
xingchun-chen 5 years ago committed by GitHub
parent
commit
6550d3871e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      dolphinscheduler-dist/release-docs/LICENSE
  2. 8
      dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-normalize
  3. 1
      dolphinscheduler-ui/package.json
  4. 2
      dolphinscheduler-ui/src/js/conf/home/index.js

1
dolphinscheduler-dist/release-docs/LICENSE vendored

@ -517,7 +517,6 @@ MIT licenses
js-cookie 2.2.1: https://github.com/js-cookie/js-cookie MIT js-cookie 2.2.1: https://github.com/js-cookie/js-cookie MIT
jsplumb 2.8.6: https://github.com/jsplumb/jsplumb MIT and GPLv2 jsplumb 2.8.6: https://github.com/jsplumb/jsplumb MIT and GPLv2
lodash 4.17.11: https://github.com/lodash/lodash MIT lodash 4.17.11: https://github.com/lodash/lodash MIT
normalize.css 8.0.1: https://github.com/necolas/normalize.css MIT
vue-treeselect 0.4.0: https://github.com/riophae/vue-treeselect MIT vue-treeselect 0.4.0: https://github.com/riophae/vue-treeselect MIT
vue 2.5.17: https://github.com/vuejs/vue MIT vue 2.5.17: https://github.com/vuejs/vue MIT
vue-router 2.7.0: https://github.com/vuejs/vue-router MIT vue-router 2.7.0: https://github.com/vuejs/vue-router MIT

8
dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-normalize vendored

@ -1,8 +0,0 @@
The MIT License (MIT)
Copyright © Nicolas Gallagher and Jonathan Neal
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

1
dolphinscheduler-ui/package.json

@ -28,7 +28,6 @@
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"jsplumb": "^2.8.6", "jsplumb": "^2.8.6",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"normalize.css": "^8.0.1",
"vue": "^2.5.17", "vue": "^2.5.17",
"vue-router": "2.7.0", "vue-router": "2.7.0",
"vuex": "^3.0.0", "vuex": "^3.0.0",

2
dolphinscheduler-ui/src/js/conf/home/index.js

@ -17,7 +17,6 @@
// The Vue build version to load with the `import` command // The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias. // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
// import $ from 'jquery'
import Vue from 'vue' import Vue from 'vue'
import App from './App' import App from './App'
import router from './router' import router from './router'
@ -31,7 +30,6 @@ import Permissions from '@/module/permissions'
import 'ans-ui/lib/ans-ui.min.css' import 'ans-ui/lib/ans-ui.min.css'
import ans from 'ans-ui/lib/ans-ui.min' import ans from 'ans-ui/lib/ans-ui.min'
import en_US from 'ans-ui/lib/locale/en' // eslint-disable-line import en_US from 'ans-ui/lib/locale/en' // eslint-disable-line
import 'normalize.css/normalize.css'
import 'sass/conf/home/index.scss' import 'sass/conf/home/index.scss'
import 'bootstrap/dist/css/bootstrap.min.css' import 'bootstrap/dist/css/bootstrap.min.css'

Loading…
Cancel
Save