Merge branch 'dev' of bitbucket.org:jumpserver/luna into dev
Showing
... | @@ -24,7 +24,7 @@ | ... | @@ -24,7 +24,7 @@ |
"angular2-logger": "^0.6.0", | "angular2-logger": "^0.6.0", | ||
"animate.css": "^3.5.2", | "animate.css": "^3.5.2", | ||
"body-parser": "^1.18.2", | "body-parser": "^1.18.2", | ||
"bootstrap": "^4.0.0-alpha.6", | "bootstrap": "^4.0.0-beta.3", | ||
"clipboard": "^1.7.1", | "clipboard": "^1.7.1", | ||
"compass-mixins": "^0.12.10", | "compass-mixins": "^0.12.10", | ||
"core-js": "^2.4.1", | "core-js": "^2.4.1", | ||
... | @@ -42,8 +42,10 @@ | ... | @@ -42,8 +42,10 @@ |
"ng2-charts": "^1.5.0", | "ng2-charts": "^1.5.0", | ||
"ng2-cookies": "^1.0.12", | "ng2-cookies": "^1.0.12", | ||
"ngx-bootstrap": "^1.6.6", | "ngx-bootstrap": "^1.6.6", | ||
"node": "^9.3.0", | |||
"npm": "^5.6.0", | "npm": "^5.6.0", | ||
"peity": "^3.2.1", | "peity": "^3.2.1", | ||
"popper.js": "^1.12.9", | |||
"roboto-fontface": "^0.8.0", | "roboto-fontface": "^0.8.0", | ||
"rxjs": "^5.4.2", | "rxjs": "^5.4.2", | ||
"sass-math": "^1.0.0", | "sass-math": "^1.0.0", | ||
... | ... |
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/sass/style.scss
0 → 100644
Please
register
or
sign in
to comment