Skip to content

Commit 4ac50f1

Browse files
committed
Added global scripts and styles for bsb theme.
1 parent 4ce8766 commit 4ac50f1

File tree

74 files changed

+10987
-73
lines changed

Some content is hidden

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

74 files changed

+10987
-73
lines changed

angular/.angular-cli.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,44 @@
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",
6057
"../node_modules/abp-web-resources/Abp/Framework/scripts/abp.js",
6158
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
6259
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
6360
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
6461
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
6562
"../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"
63+
"../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js",
64+
"../src/bsb-theme/js/admin.js"
6765
],
6866
"environmentSource": "environments/environment.ts",
6967
"environments": {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ShowAllFiles>true</ShowAllFiles>
4+
<ShowAllFiles>false</ShowAllFiles>
55
</PropertyGroup>
66
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
44
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
55
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6-
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\GitHub\module-zero-core-template\angular\obj\project.assets.json</ProjectAssetsFile>
6+
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\Github\module-zero-core-template\angular\obj\project.assets.json</ProjectAssetsFile>
77
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
8-
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\aliriza\.nuget\packages\</NuGetPackageFolders>
8+
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\hikalkan\.nuget\packages\</NuGetPackageFolders>
99
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
1010
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.2.0</NuGetToolVersion>
1111
</PropertyGroup>

angular/obj/project.assets.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
".NETFramework,Version=v4.5.2": []
99
},
1010
"packageFolders": {
11-
"C:\\Users\\aliriza\\.nuget\\packages\\": {}
11+
"C:\\Users\\hikalkan\\.nuget\\packages\\": {}
1212
},
1313
"project": {
1414
"version": "1.0.0",
1515
"restore": {
16-
"projectUniqueName": "D:\\GitHub\\module-zero-core-template\\angular\\AbpCompanyName.AbpProjectName.AngularUI.csproj",
16+
"projectUniqueName": "D:\\Github\\module-zero-core-template\\angular\\AbpCompanyName.AbpProjectName.AngularUI.csproj",
1717
"projectName": "AbpCompanyName.AbpProjectName.AngularUI",
18-
"projectPath": "D:\\GitHub\\module-zero-core-template\\angular\\AbpCompanyName.AbpProjectName.AngularUI.csproj",
19-
"outputPath": "D:\\GitHub\\module-zero-core-template\\angular\\obj\\",
18+
"projectPath": "D:\\Github\\module-zero-core-template\\angular\\AbpCompanyName.AbpProjectName.AngularUI.csproj",
19+
"outputPath": "D:\\Github\\module-zero-core-template\\angular\\obj\\",
2020
"projectStyle": "PackageReference",
2121
"originalTargetFrameworks": [
2222
"net452"

angular/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,22 @@
3333
"@types/toastr": "^2.1.33",
3434
"abp-ng2-module": "^1.0.0",
3535
"abp-web-resources": "^1.3.0",
36+
"animate.css": "^3.5.2",
3637
"block-ui": "^2.70.1",
3738
"bootstrap": "^3.3.7",
38-
"bootswatch": "^3.3.7",
39+
"bootstrap-select": "^1.12.2",
3940
"core-js": "^2.4.1",
4041
"famfamfam-flags": "^1.0.0",
4142
"font-awesome": "^4.7.0",
4243
"jquery": "^3.1.1",
4344
"jquery-migrate": "^3.0.0",
45+
"jquery-slimscroll": "^1.3.8",
4446
"js-cookie": "^2.1.4",
4547
"lodash": "^4.17.4",
4648
"moment": "^2.18.1",
4749
"moment-timezone": "^0.5.13",
4850
"ngx-bootstrap": "^1.6.6",
51+
"node-waves": "^0.7.5",
4952
"push.js": "0.0.12",
5053
"rxjs": "^5.3.0",
5154
"signalr": "^2.2.1",

angular/src/app/home/home.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h1>{{l('WellcomeMessage')}}</h1>
33
<div class="row">
44
<div class="col-md-12">
5-
5+
<i class="material-icons">people</i>
66
</div>
77
</div>
88
</div>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* fallback */
2+
@font-face {
3+
font-family: 'Material Icons';
4+
font-style: normal;
5+
font-weight: 400;
6+
src: local('Material Icons'), local('MaterialIcons-Regular'), url(materialicons.woff2) format('woff2');
7+
}
8+
9+
.material-icons {
10+
font-family: 'Material Icons';
11+
font-weight: normal;
12+
font-style: normal;
13+
font-size: 24px;
14+
line-height: 1;
15+
letter-spacing: normal;
16+
text-transform: none;
17+
display: inline-block;
18+
white-space: nowrap;
19+
word-wrap: normal;
20+
direction: ltr;
21+
-webkit-font-feature-settings: 'liga';
22+
-webkit-font-smoothing: antialiased;
23+
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)