Skip to content

Commit f7b67e3

Browse files
committed
prepare Argon dependencies for Angular project
1 parent 0e803be commit f7b67e3

File tree

138 files changed

+66
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+66
-48
lines changed

angular.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,25 @@
2020
"tsConfig": "src/tsconfig.app.json",
2121
"assets": [
2222
"src/favicon.ico",
23-
"src/assets"
23+
"src/assets",
24+
{ "glob": "**/*", "input": "src/lib", "output": "./lib" }
2425
],
2526
"styles": [
26-
"src/css/argon.css",
27-
"node_modules/bootstrap/dist/css/bootstrap.min.css",
28-
"node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.nin.css",
27+
"src/styles.css",
28+
"node_modules/bootstrap/dist/css/bootstrap.css",
29+
"node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css",
30+
"node_modules/@fortawesome/fontawesome-free/css/all.css",
2931
"node_modules/nouislider/distribute/nouislider.min.css"
3032
],
3133
"scripts": [
32-
"src/js/argon.js",
3334
"node_modules/jquery/dist/jquery.min.js",
34-
"node_modules/popper.js/dist/popper.min.js",
35+
"node_modules/popper.js/dist/umd/popper.min.js",
3536
"node_modules/bootstrap/dist/js/bootstrap.min.js",
36-
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js",
37-
"node_modules/headroom.js/dist/js/headroom.min.js",
37+
"node_modules/headroom.js/dist/headroom.min.js",
38+
39+
"node_modules/onscreen/dist/on-screen.umd.min.js",
3840
"node_modules/nouislider/distribute/nouislider.min.js",
39-
"node_modules/onscreen/dist/on-screen.umd.min.js"
41+
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"
4042
]
4143
},
4244
"configurations": {

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "argon-angular",
3-
"version": "0.0.0",
3+
"version": "1.0.0",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",
@@ -20,14 +20,15 @@
2020
"@angular/platform-browser": "^6.1.0",
2121
"@angular/platform-browser-dynamic": "^6.1.0",
2222
"@angular/router": "^6.1.0",
23+
"@fortawesome/fontawesome-free": "^5.2.0",
2324
"bootstrap": "^4.1.3",
2425
"bootstrap-datepicker": "^1.8.0",
2526
"core-js": "^2.5.4",
2627
"headroom.js": "^0.9.4",
2728
"jquery": "^3.3.1",
2829
"nouislider": "^11.1.0",
2930
"onscreen": "^1.3.2",
30-
"popper.js": "^1.14.3",
31+
"popper.js": "^1.14.4",
3132
"rxjs": "^6.0.0",
3233
"zone.js": "~0.8.26"
3334
},
@@ -36,9 +37,12 @@
3637
"@angular/cli": "~6.1.1",
3738
"@angular/compiler-cli": "^6.1.0",
3839
"@angular/language-service": "^6.1.0",
40+
"@types/bootstrap": "^4.1.2",
3941
"@types/jasmine": "~2.8.6",
4042
"@types/jasminewd2": "~2.0.3",
43+
"@types/jquery": "^3.3.5",
4144
"@types/node": "~8.9.4",
45+
"@types/popper.js": "^1.11.0",
4246
"codelyzer": "~4.2.1",
4347
"jasmine-core": "~2.99.1",
4448
"jasmine-spec-reporter": "~4.2.1",

src/index.html

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,22 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<title>ArgonAngular</title>
6-
<base href="/">
7-
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
<link rel="icon" type="image/x-icon" href="favicon.ico">
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<meta name="description" content="Start your development with a Design System for Bootstrap 4.">
7+
<meta name="author" content="Creative Tim">
8+
<title>Argon Design System - Free Design System for Bootstrap 4 & Angular</title>
9+
<!-- Favicon -->
10+
<link href="./assets/img/brand/favicon.png" rel="icon" type="image/png">
11+
<!-- Fonts -->
12+
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
13+
<!-- Argon CSS -->
14+
<link type="text/css" href="./lib/css/argon.min.css?v=1.0.0" rel="stylesheet">
15+
<!-- Docs CSS -->
16+
<link type="text/css" href="./lib/css/docs.min.css" rel="stylesheet">
1017
</head>
1118
<body>
1219
<app-root></app-root>
20+
<!-- Argon JS -->
21+
<script src="./lib/js/argon.min.js?v=1.0.0"></script>
1322
</body>
1423
</html>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/assets/scss/argon.scss renamed to src/lib/scss/argon.scss

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -64,37 +64,37 @@
6464

6565
// Custom components
6666

67-
@import "custom/reboot.scss";
68-
@import "custom/global.scss";
69-
@import "custom/utilities.scss";
70-
71-
@import "custom/accordion.scss";
72-
@import "custom/alerts.scss";
73-
@import "custom/avatars.scss";
74-
@import "custom/badge.scss";
75-
@import "custom/buttons.scss";
76-
@import "custom/card.scss";
77-
@import "custom/carousel.scss";
78-
@import "custom/close.scss";
79-
@import "custom/custom-forms.scss";
80-
@import "custom/dropdown.scss";
81-
@import "custom/footer.scss";
82-
@import "custom/forms.scss";
83-
@import "custom/grid.scss";
84-
@import "custom/icons.scss";
85-
@import "custom/input-group.scss";
86-
@import "custom/list-group.scss";
87-
@import "custom/modal.scss";
88-
@import "custom/nav.scss";
89-
@import "custom/navbar.scss";
90-
@import "custom/pagination.scss";
91-
@import "custom/popover.scss";
92-
@import "custom/progress.scss";
93-
@import "custom/section.scss";
94-
@import "custom/type.scss";
67+
@import "custom/reboot";
68+
@import "custom/global";
69+
@import "custom/utilities";
70+
71+
@import "custom/accordion";
72+
@import "custom/alerts";
73+
@import "custom/avatars";
74+
@import "custom/badge";
75+
@import "custom/buttons";
76+
@import "custom/card";
77+
@import "custom/carousel";
78+
@import "custom/close";
79+
@import "custom/custom-forms";
80+
@import "custom/dropdown";
81+
@import "custom/footer";
82+
@import "custom/forms";
83+
@import "custom/grid";
84+
@import "custom/icons";
85+
@import "custom/input-group";
86+
@import "custom/list-group";
87+
@import "custom/modal";
88+
@import "custom/nav";
89+
@import "custom/navbar";
90+
@import "custom/pagination";
91+
@import "custom/popover";
92+
@import "custom/progress";
93+
@import "custom/section";
94+
@import "custom/type";
9595

9696
// Vendor
9797

98-
@import "custom/vendor/bootstrap-datepicker.scss";
99-
@import "custom/vendor/headroom.scss";
100-
@import "custom/vendor/nouislider.scss";
98+
@import "custom/vendor/bootstrap-datepicker";
99+
@import "custom/vendor/headroom";
100+
@import "custom/vendor/nouislider";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/tsconfig.app.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
5-
"types": []
5+
"types": [
6+
"jquery",
7+
"bootstrap"
8+
]
69
},
710
"exclude": [
811
"src/test.ts",

0 commit comments

Comments
 (0)