Skip to content

Commit c0f1f97

Browse files
committed
Merge branch 'release/1.1.1'
2 parents 7ffb5f4 + aa1fcdc commit c0f1f97

File tree

8 files changed

+2965
-5526
lines changed

8 files changed

+2965
-5526
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ $ npm run build:lib
3636

3737
## Dependencies
3838

39-
* admin-lte css
40-
* bootstrap css
39+
* admin-lte-css
4140

4241
## Todos
4342

angular.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
{ "glob": "favicon.ico", "input": "demo/src", "output": "/" },
2222
],
2323
"styles": [
24-
"node_modules/bootstrap/dist/css/bootstrap.css",
24+
"node_modules/bootstrap-css-only/css/bootstrap.min.css",
2525
"node_modules/font-awesome/css/font-awesome.css",
2626
"node_modules/ionicons/css/ionicons.css",
27-
"node_modules/morris.js/morris.css",
2827
"node_modules/prismjs/themes/prism-tomorrow.css",
29-
"node_modules/admin-lte/dist/css/AdminLTE.css",
30-
"node_modules/admin-lte/dist/css/skins/_all-skins.css",
28+
"node_modules/admin-lte-css/dist/css/AdminLTE.css",
29+
"node_modules/admin-lte-css/dist/css/skins/_all-skins.css",
3130
"demo/src/styles.css"
3231
],
3332
"scripts": [

changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## CHANGE LOG:
2+
3+
v1.1.1:
4+
- Update admin-lte to 2.4.3
5+
- Change admin-lte dependency to admin-lte-css
6+
- Remove bootstrap dependency
7+
8+
v1.0.1:
9+
- Fix ie bug
10+
11+
v1.0.0:
12+
- Update to angular 6

demo/src/app/home/home.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<mk-box header="Dependencies" [isCollapsable]="false" [isRemovable]="false">
1818
<p>Angular Admin LTE have no JS dependencies but still need Admin LTE and Bootstrap CSS. You can also use FontAwesome and Ionicons as it is used by default in Admin LTE.</p>
1919
<pre><code class="language-typescript">"styles": [
20-
"../../node_modules/bootstrap/dist/css/bootstrap.css",
21-
"../../node_modules/font-awesome/css/font-awesome.css",
22-
"../../node_modules/ionicons/css/ionicons.css",
23-
"../../node_modules/admin-lte/dist/css/AdminLTE.css",
24-
"../../node_modules/admin-lte/dist/css/skins/_all-skins.css"
20+
"node_modules/bootstrap-css-only/css/bootstrap.min.css",
21+
"node_modules/font-awesome/css/font-awesome.css",
22+
"node_modules/ionicons/css/ionicons.css",
23+
"node_modules/admin-lte-css/dist/css/AdminLTE.css",
24+
"node_modules/admin-lte/dist/css/skins/_all-skins.css"
2525
]</code></pre>
2626
</mk-box>

demo/src/polyfills.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
*/
2020

2121
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
// import 'core-js/es6/symbol';
23-
// import 'core-js/es6/object';
24-
// import 'core-js/es6/function';
25-
// import 'core-js/es6/parse-int';
26-
// import 'core-js/es6/parse-float';
27-
// import 'core-js/es6/number';
28-
// import 'core-js/es6/math';
29-
// import 'core-js/es6/string';
30-
// import 'core-js/es6/date';
31-
// import 'core-js/es6/array';
32-
// import 'core-js/es6/regexp';
33-
// import 'core-js/es6/map';
34-
// import 'core-js/es6/weak-map';
35-
// import 'core-js/es6/set';
22+
import 'core-js/es6/symbol';
23+
import 'core-js/es6/object';
24+
import 'core-js/es6/function';
25+
import 'core-js/es6/parse-int';
26+
import 'core-js/es6/parse-float';
27+
import 'core-js/es6/number';
28+
import 'core-js/es6/math';
29+
import 'core-js/es6/string';
30+
import 'core-js/es6/date';
31+
import 'core-js/es6/array';
32+
import 'core-js/es6/regexp';
33+
import 'core-js/es6/map';
34+
import 'core-js/es6/weak-map';
35+
import 'core-js/es6/set';
3636

3737
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
3838
// import 'classlist.js'; // Run `npm install --save classlist.js`.

0 commit comments

Comments
 (0)