Skip to content

Commit 194e12b

Browse files
committed
Update dependencies & improve bootstrap UI
1 parent 542b1ae commit 194e12b

File tree

14 files changed

+558
-7805
lines changed

14 files changed

+558
-7805
lines changed

angular/package-lock.json

Lines changed: 225 additions & 7557 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

angular/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-bootstrap",
3-
"version": "15.0.3",
3+
"version": "15.0.4",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve --port 4200",
@@ -13,33 +13,33 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "15.0.3",
17-
"@angular/common": "15.0.3",
18-
"@angular/compiler": "15.0.3",
19-
"@angular/core": "15.0.3",
20-
"@angular/forms": "15.0.3",
21-
"@angular/platform-browser": "15.0.3",
22-
"@angular/platform-browser-dynamic": "15.0.3",
23-
"@angular/router": "15.0.3",
16+
"@angular/animations": "15.0.4",
17+
"@angular/common": "15.0.4",
18+
"@angular/compiler": "15.0.4",
19+
"@angular/core": "15.0.4",
20+
"@angular/forms": "15.0.4",
21+
"@angular/platform-browser": "15.0.4",
22+
"@angular/platform-browser-dynamic": "15.0.4",
23+
"@angular/router": "15.0.4",
2424
"@fortawesome/fontawesome-free": "6.2.1",
2525
"bootstrap": "5.2.3",
26-
"rxjs": "7.6.0",
26+
"rxjs": "7.8.0",
2727
"tslib": "2.4.1",
2828
"zone.js": "0.12.0"
2929
},
3030
"devDependencies": {
31-
"@angular-devkit/build-angular": "15.0.3",
31+
"@angular-devkit/build-angular": "15.0.4",
3232
"@angular-eslint/builder": "15.1.0",
3333
"@angular-eslint/eslint-plugin": "15.1.0",
3434
"@angular-eslint/eslint-plugin-template": "15.1.0",
3535
"@angular-eslint/schematics": "15.1.0",
3636
"@angular-eslint/template-parser": "15.1.0",
37-
"@angular/cli": "15.0.3",
38-
"@angular/compiler-cli": "15.0.3",
37+
"@angular/cli": "15.0.4",
38+
"@angular/compiler-cli": "15.0.4",
3939
"@types/jasmine": "4.3.1",
40-
"@typescript-eslint/eslint-plugin": "5.46.0",
41-
"@typescript-eslint/parser": "5.46.0",
42-
"eslint": "8.29.0",
40+
"@typescript-eslint/eslint-plugin": "5.47.0",
41+
"@typescript-eslint/parser": "5.47.0",
42+
"eslint": "8.30.0",
4343
"jasmine-core": "4.5.0",
4444
"karma": "6.4.1",
4545
"karma-chrome-launcher": "3.1.1",

angular/src/app/app.component.css

Lines changed: 76 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
1-
.navbar.navbar-dark .navbar-nav .nav-item .nav-link {
1+
.nga-nav-link {
22
color: white;
3+
border-top: 1px solid #000;
4+
border-bottom: 1px solid #000;
35
font-weight: 500;
4-
border-top: 1px solid #09238d;
5-
border-bottom: 1px solid #09238d;
66
}
77

8-
.navbar.navbar-dark .navbar-nav .nav-item .nav-link:hover {
8+
.nga-nav-link:hover {
99
color: yellow;
1010
border-top: 1px solid yellow;
1111
border-bottom: 1px solid yellow;
1212
}
1313

14+
1415
.nga-navbar {
1516
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 11px 10px 0 rgba(0, 0, 0, 0.12);
1617
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 11px 10px 0 rgba(0, 0, 0, 0.12);
17-
background-color: #09238d;
18-
}
19-
20-
.nga-navbar-logo {
21-
font-weight: 700;
22-
}
23-
24-
.nga-navbar-logo:hover {
25-
color: rgba(255, 255, 255, 0.75);
18+
background-color: #000;
2619
}
2720

2821
.nga-logo {
29-
font-weight: 700;
22+
font-weight: 500;
3023
}
3124

3225
.nga-logo:hover {
3326
color: rgba(255, 255, 255, 0.75);
3427
}
3528

29+
.nga-btn-navbar {
30+
--bs-btn-color: #fff;
31+
--bs-btn-bg: #1976d2;
32+
--bs-btn-border-color: #1976d2;
33+
--bs-btn-hover-color: #fff;
34+
--bs-btn-hover-bg: #0b5ed7;
35+
--bs-btn-hover-border-color: #0a58ca;
36+
}
37+
3638
.nga-footer {
3739
background-color: #212121;
3840
color: white;
@@ -45,14 +47,70 @@
4547

4648
.nga-footer a:hover,
4749
.nga-footer a:focus {
48-
color: yellow;
50+
color: white;
4951
text-decoration: underline;
5052
}
5153

52-
.nga-footer .hint {
54+
.nga-footer .nga-hint {
5355
background-color: #1976d2;
5456
}
5557

56-
.nga-footer .hint:hover {
58+
.nga-footer .nga-hint:hover {
5759
opacity: 0.8;
58-
}
60+
}
61+
62+
.nga-btn-social {
63+
position: relative;
64+
z-index: 1;
65+
display: inline-block;
66+
padding: 0;
67+
margin: 10px;
68+
overflow: hidden;
69+
vertical-align: middle;
70+
cursor: pointer;
71+
border-radius: 50%;
72+
-webkit-box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15);
73+
box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15);
74+
-webkit-transition: all 0.2s ease-in-out;
75+
transition: all 0.2s ease-in-out;
76+
width: 47px;
77+
height: 47px
78+
}
79+
80+
.nga-btn-social i {
81+
font-size: 1.25rem;
82+
line-height: 47px
83+
}
84+
85+
.nga-btn-social i {
86+
display: inline-block;
87+
width: inherit;
88+
color: white;
89+
text-align: center
90+
}
91+
92+
.nga-btn-social:hover {
93+
-webkit-box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
94+
box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)
95+
}
96+
97+
.nga-btn-social i:hover {
98+
color: black;
99+
}
100+
101+
.nga-btn-github {
102+
background-color: #333;
103+
}
104+
105+
.nga-btn-gitlab {
106+
background-color: #ff4500;
107+
}
108+
109+
.nga-btn-linkedin {
110+
background-color: #0082ca;
111+
}
112+
113+
.nga-btn-twitter {
114+
background-color: #55acee;
115+
}
116+

angular/src/app/app.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
<div class="collapse navbar-collapse" id="navbarCollapse">
1313
<ul class="navbar-nav mx-auto">
1414
<li class="nav-item">
15-
<a class="nav-link" aria-current="page" routerLink="/">
15+
<a class="nav-link nga-nav-link" aria-current="page" routerLink="/">
1616
<i class="fas fa-home me-1"></i>Home</a>
1717
</li>
1818
</ul>
1919
<ul class="navbar-nav me-auto">
2020
<li class="nav-item">
21-
<a class="nav-link active" aria-current="page" routerLink="/about">
21+
<a class="nav-link nga-nav-link" aria-current="page" routerLink="/about">
2222
<i class="far fa-question-circle me-1"></i>About</a>
2323
</li>
2424
<li class="nav-item">
25-
<a class="nav-link" aria-current="page" routerLink="/contact">
25+
<a class="nav-link nga-nav-link" aria-current="page" routerLink="/contact">
2626
<i class="fas fa-envelope me-1"></i>Contact</a>
2727
</li>
2828
</ul>
Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
.nga-card {
2-
display: block;
3-
background-color: rgba(255, 255, 255, .8);
4-
box-shadow: 0 1px 3px rgba(0, 0, 0, .12), 0 1px 2px rgba(0, 0, 0, .24);
5-
border-radius: 2px;
6-
transition: all .2s ease-in-out;
7-
cursor: pointer;
8-
}
9-
10-
.nga-card:hover {
11-
transform: translateY(-3px);
12-
box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23);
13-
}
14-
15-
.nga-card a {
16-
color: black;
17-
text-decoration: none;
18-
}
19-
20-
.nga-card a:hover {
21-
color: #0d6efd;
22-
text-decoration: none;
23-
}
24-
2+
border: 1px solid rgba(0, 0, 0, 0.125);
3+
border-radius: 0.25rem;
4+
}
5+
6+
.nga-card a {
7+
color: #0d6efd;
8+
text-decoration: none;
9+
}
10+
11+
.nga-card a:hover {
12+
color: #0d6efd;
13+
}
14+
15+
.nga-card:hover {
16+
border: 1px solid #99ccff;
17+
color: #0d6efd;
18+
box-shadow: rgba(0, 0, 0, 0.15) 0px 15px 25px, rgba(0, 0, 0, 0.05) 0px 5px 10px;
19+
transition: box-shadow 0.3s ease-in-out;
20+
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h3 class="h5">Features<i class="fas fa-list ms-2"></i></h3>
3131
</div>
3232
<div class="row pt-2">
3333
<div class="col-12 col-sm-6 col-md-4 col-lg-4 col-xl-3 mb-2">
34-
<div class="card nga-card bg-light mb-3">
34+
<div class="card nga-card mb-2">
3535
<a routerLink="/bootstrap">
3636
<div class="card-header">
3737
<div class="row">
@@ -50,7 +50,7 @@ <h4 class="card-title h5">Bootstrap</h4>
5050
</div>
5151
</div>
5252
<div class="col-12 col-sm-6 col-md-4 col-lg-4 col-xl-3 mb-2">
53-
<div class="card nga-card bg-light mb-3">
53+
<div class="card nga-card mb-2">
5454
<div class="card-header">
5555
<div class="row">
5656
<div class="col-10 col-xl-10">
@@ -67,7 +67,7 @@ <h4 class="card-title h5">Services</h4>
6767
</div>
6868
</div>
6969
<div class="col-12 col-sm-6 col-md-4 col-lg-4 col-xl-3 mb-2">
70-
<div class="card nga-card bg-light mb-3">
70+
<div class="card nga-card mb-2">
7171
<div class="card-header">
7272
<div class="row">
7373
<div class="col-10 col-xl-10">
@@ -84,7 +84,7 @@ <h4 class="card-title h5">Components</h4>
8484
</div>
8585
</div>
8686
<div class="col-12 col-sm-6 col-md-4 col-lg-4 col-xl-3 mb-2">
87-
<div class="card nga-card bg-light mb-3">
87+
<div class="card nga-card mb-2">
8888
<div class="card-header">
8989
<div class="row">
9090
<div class="col-10 col-xl-10">
@@ -101,7 +101,7 @@ <h4 class="card-title h5">Reactive Forms</h4>
101101
</div>
102102
</div>
103103
<div class="col-12 col-sm-6 col-md-4 col-lg-4 col-xl-3 mb-2">
104-
<div class="card nga-card bg-light mb-3">
104+
<div class="card nga-card mb-2">
105105
<div class="card-header">
106106
<div class="row">
107107
<div class="col-10 col-xl-10">

0 commit comments

Comments
 (0)