diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 4bee294f..00000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "node_modules" -} diff --git a/.travis.yml b/.travis.yml index 157b81b5..060120df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ install: - npm install -g npm@3 - npm install -g webpack - npm install -g typescript - - npm install -g bower - npm install diff --git a/Dockerfile b/Dockerfile index 991928ae..5a67d9a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,7 @@ RUN git clone https://github.com/akveo/ng2-admin.git /var/www \ && cd /var/www \ && npm install --global rimraf \ && npm run clean \ - && npm install --global bower typings webpack webpack-dev-server typescript \ - && bower install --allow-root \ + && npm install --global typings webpack webpack-dev-server typescript \ && npm install \ && npm run prebuild:prod && npm run build:prod diff --git a/LICENSE b/LICENSE index 88bd8b83..997810b7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2016 AngularClass LLC +Copyright (c) 2016 akveo.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/bower.json b/bower.json deleted file mode 100644 index ae477332..00000000 --- a/bower.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "ng2-admin", - "version": "0.4.2", - "description": "Angular 2 and Bootstrap 4 Admin Template.", - "author": "akveo", - "homepage": "http://akveo.github.io/ng2-admin/", - "license": "MIT", - "moduleType": [ - "es6" - ], - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "test", - "tests" - ], - "dependencies": { - "Ionicons": "ionicons#~2.0.1" - } -} diff --git a/config/webpack.common.js b/config/webpack.common.js index c09809d8..cdbe3e49 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -211,10 +211,6 @@ module.exports = { allChunks: true }), - new webpack.ResolverPlugin( - new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('bower.json', ['main']) - ), - /* * Plugin: ForkCheckerPlugin * Description: Do type checking in a separate process, so webpack don't need to wait. diff --git a/docs/contents/articles/002-installation-guidelines/index.md b/docs/contents/articles/002-installation-guidelines/index.md index d3931dc0..b3d30210 100644 --- a/docs/contents/articles/002-installation-guidelines/index.md +++ b/docs/contents/articles/002-installation-guidelines/index.md @@ -34,11 +34,6 @@ npm install --global webpack-dev-server npm install --global typescript@beta ``` -* bower -``` -npm install --global bower -``` - ## Clone repository and install dependencies You will need to clone the source code of ng2-admin GitHub repository: @@ -52,9 +47,6 @@ npm install ``` This will setup a working copy of ng2-admin on your local machine. -**Note**: If you have any issues after the installation, additionally run the following: -```bash -bower install ``` ## Running local copy diff --git a/docs/contents/articles/012-project-structure/index.md b/docs/contents/articles/012-project-structure/index.md index ee55241d..2b89cbfa 100644 --- a/docs/contents/articles/012-project-structure/index.md +++ b/docs/contents/articles/012-project-structure/index.md @@ -54,8 +54,6 @@ ng2-admin/ ├──typedoc.json * typescript documentation generator ├──tsconfig.json * config that webpack uses for typescript ├──typings.json * our typings manager - ├──package.json * what npm uses to manage it's dependencies - ├──bower.json * DEPRECATED - moving to npm as primary package manager for all dependenties - └──.bowerrc * DEPRECARD - temporary bower configuration + └──package.json * what npm uses to manage it's dependencies ``` In our template we tried to separate theme layer and presentation layer. We believe most of other templates have them combined. That's why when you start developing using them, it gets very hard for you to remove things you don't need. diff --git a/package.json b/package.json index 5d2b1a60..6a701d67 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "google-maps": "^3.2.1", "http-server": "^0.9.0", "ie-shim": "^0.1.0", + "ionicons": "^2.0.1", "jquery": "^2.2.3", "jquery-slimscroll": "^1.3.6", "leaflet": "^0.7.7", @@ -129,7 +130,6 @@ "gh-pages": "wintersmith build -C docs && gh-pages -d docs/build", "start": "npm run server:dev", "start:hmr": "npm run server:dev:hmr", - "postinstall": "bower install", "version": "npm run build", "postversion": "git push && git push --tags" }, diff --git a/src/app/theme/components/baSidebar/baSidebar.scss b/src/app/theme/components/baSidebar/baSidebar.scss index 1f843eee..b5f6d40b 100644 --- a/src/app/theme/components/baSidebar/baSidebar.scss +++ b/src/app/theme/components/baSidebar/baSidebar.scss @@ -8,7 +8,7 @@ $angle-right: "\f101"; width: $sidebar-width; top: $top-height; left: 0; - z-index: 904; + z-index: 1001; display: block; min-height: 100%; background-color: $sidebar; diff --git a/src/app/theme/sass/_ionicons.scss b/src/app/theme/sass/_ionicons.scss index 213ad922..1861ce8b 100644 --- a/src/app/theme/sass/_ionicons.scss +++ b/src/app/theme/sass/_ionicons.scss @@ -1,3 +1,3 @@ -$ionicons-font-path: "~Ionicons/fonts"; +$ionicons-font-path: "~ionicons/fonts"; -@import "~Ionicons/scss/ionicons"; +@import "~ionicons/scss/ionicons"; diff --git a/src/app/theme/sass/_preloader.scss b/src/app/theme/sass/_preloader.scss index 87970996..5622442d 100644 --- a/src/app/theme/sass/_preloader.scss +++ b/src/app/theme/sass/_preloader.scss @@ -31,7 +31,7 @@ left: 0; width: 100%; height: 100%; - z-index: 1000; + z-index: 1003; background: #000000; & > div { display: block;