Skip to content

Commit d48f685

Browse files
authored
Merge pull request #50 from aspnetboilerplate/bsb-theme
Bsb theme implemented for angular2 UI
2 parents 4ce8766 + cdd3349 commit d48f685

File tree

145 files changed

+12500
-606
lines changed

Some content is hidden

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

145 files changed

+12500
-606
lines changed

angular/.angular-cli.json

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,55 @@
2424
"tsconfig": "tsconfig.json",
2525
"prefix": "app",
2626
"styles": [
27+
"assets/fonts/roboto/roboto.css",
28+
"assets/fonts/material-icons/materialicons.css",
29+
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
2730
"../node_modules/simple-line-icons/css/simple-line-icons.css",
2831
"../node_modules/font-awesome/css/font-awesome.css",
2932
"../node_modules/famfamfam-flags/dist/sprite/famfamfam-flags.css",
30-
3133
"../node_modules/toastr/build/toastr.css",
3234
"../node_modules/sweetalert/dist/sweetalert.css",
33-
34-
"../src/shared/core.less",
35-
36-
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
37-
"../node_modules/bootswatch/cosmo/bootstrap.min.css",
38-
39-
"../src/styles.css"
35+
"../node_modules/node-waves/dist/waves.css",
36+
"../src/bsb-theme/css/materialize.css",
37+
"../src/bsb-theme/css/style.css",
38+
"../src/bsb-theme/css/themes/all-themes.css",
39+
"../src/shared/core.less"
4040
],
4141
"scripts": [
4242
"../node_modules/jquery/dist/jquery.min.js",
4343
"../node_modules/jquery-migrate/dist/jquery-migrate.min.js",
4444
"../node_modules/js-cookie/src/js.cookie.js",
45-
4645
"../node_modules/bootstrap/dist/js/bootstrap.js",
47-
4846
"../node_modules/lodash/lodash.min.js",
4947
"../node_modules/moment/min/moment.min.js",
50-
5148
"../node_modules/signalr/jquery.signalR.js",
52-
5349
"../node_modules/toastr/toastr.js",
5450
"../node_modules/sweetalert/dist/sweetalert-dev.js",
5551
"../node_modules/block-ui/jquery.blockUI.js",
5652
"../node_modules/spin.js/spin.min.js",
5753
"../node_modules/spin.js/jquery.spin.js",
5854
"../node_modules/push.js/push.min.js",
59-
55+
"../node_modules/jquery-slimscroll/jquery.slimscroll.min.js",
56+
"../node_modules/node-waves/dist/waves.min.js",
57+
"../node_modules/jquery-countto/jquery.countTo.js",
58+
"../node_modules/raphael/raphael.min.js",
59+
"../node_modules/morris.js/morris.min.js",
60+
"../node_modules/chart.js/dist/Chart.bundle.min.js",
61+
"../node_modules/flot/jquery.flot.js",
62+
"../node_modules/flot/jquery.flot.resize.js",
63+
"../node_modules/flot/jquery.flot.pie.js",
64+
"../node_modules/flot/jquery.flot.categories.js",
65+
"../node_modules/flot/jquery.flot.time.js",
66+
"../node_modules/jquery-sparkline/jquery.sparkline.min.js",
6067
"../node_modules/abp-web-resources/Abp/Framework/scripts/abp.js",
6168
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
6269
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
6370
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
6471
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
6572
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
66-
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js"
73+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js",
74+
"../src/bsb-theme/js/admin.js",
75+
"../src/bsb-theme/js/demo.js"
6776
],
6877
"environmentSource": "environments/environment.ts",
6978
"environments": {

angular/.editorconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# Editor configuration, see http://editorconfig.org
1+
# Editor configuration, see http://editorconfig.org
22
root = true
33

44
[*]
55
charset = utf-8
66
indent_style = space
7-
indent_size = 2
87
insert_final_newline = true
98
trim_trailing_whitespace = true
109

angular/AbpCompanyName.AbpProjectName.AngularUI.csproj.user

Lines changed: 0 additions & 6 deletions
This file was deleted.

angular/obj/AbpCompanyName.AbpProjectName.AngularUI.csproj.nuget.g.props

Lines changed: 0 additions & 15 deletions
This file was deleted.

angular/obj/AbpCompanyName.AbpProjectName.AngularUI.csproj.nuget.g.targets

Lines changed: 0 additions & 6 deletions
This file was deleted.

angular/obj/Debug/net452/AbpCompanyName.AbpProjectName.AngularUI.AssemblyInfo.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

angular/obj/Debug/net452/CoreCompileInputs.cache

Lines changed: 0 additions & 1 deletion
This file was deleted.

angular/obj/Debug/net452/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs

Whitespace-only changes.

angular/obj/Debug/net452/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs

Whitespace-only changes.

angular/obj/Debug/net452/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs

Whitespace-only changes.

0 commit comments

Comments
 (0)