Skip to content

Commit d210e1b

Browse files
committed
fix(styles): remove dist/vendor, add core-js, add font-awesome
* Removed glyphicons since they are removed in Bootstrap4, replaced with Font-awesome * Removed dist/vendor file accidentally put there in Layout * Fixed Nav styles * Replaced es6-shim dev dep with Core-JS (much better one) Closes TrilonIO#43 Potential fix for TrilonIO#44
1 parent 12adacc commit d210e1b

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

Client/components/navmenu/navmenu.component.css

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
li .glyphicon {
1+
li .fa {
22
margin-right: 10px;
33
}
44

@@ -11,13 +11,9 @@ li.link-active a:focus {
1111
}
1212

1313
/* Keep the nav menu independent of scrolling and on top of other items */
14-
.main-nav {
15-
position: fixed;
16-
top: 0;
17-
left: 0;
18-
right: 0;
19-
z-index: 1;
20-
}
14+
.nav { }
15+
.nav li a { padding:10px 20px; }
16+
.nav li a:hover, .nav li a:focus { text-decoration: none; }
2117

2218
@media (min-width: 768px) {
2319
/* On small screens, convert the nav menu to a vertical sidebar */

Client/components/navmenu/navmenu.component.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@
22
<ul class="nav">
33
<li [routerLinkActive]="['link-active']">
44
<a [routerLink]="['/home']">
5-
<span class="glyphicon glyphicon-home"></span> Home
5+
<i class="fa fa-home" aria-hidden="true"></i> Home
66
</a>
77
</li>
88
<li [routerLinkActive]="['link-active']">
99
<a [routerLink]="['/examples']">
10-
<span class="glyphicon glyphicon-education"></span> Platform Examples
10+
<i class="fa fa-window-maximize" aria-hidden="true"></i> Platform Examples
1111
</a>
1212
</li>
1313
<li [routerLinkActive]="['link-active']">
1414
<a [routerLink]="['/bootstrap']">
15-
<span class="glyphicon glyphicon-education"></span> Bootstrap Demo
15+
<i class="fa fa-graduation-cap" aria-hidden="true"></i> Bootstrap Demo
1616
</a>
1717
</li>
1818
<li [routerLinkActive]="['link-active']">
1919
<a [routerLink]="['/rest-test']">
20-
<span class="glyphicon glyphicon-education"></span> RestAPI Demo
20+
<i class="fa fa-chrome" aria-hidden="true"></i> RestAPI Demo
2121
</a>
2222
</li>
2323
<li [routerLinkActive]="['link-active']">
2424
<a [routerLink]="['/faq']">
25-
<span class="glyphicon glyphicon-education"></span> FAQ
25+
<i class="fa fa-question-circle" aria-hidden="true"></i> FAQ
2626
</a>
2727
</li>
2828
<li *ngIf="!loggedIn$" [routerLinkActive]="['link-active']">
2929
<a [routerLink]="['/login']">
30-
<span class="glyphicon glyphicon-user"></span> Login
30+
<i class="fa fa-user" aria-hidden="true"></i> Login
3131
</a>
3232
</li>
3333
<li *ngIf="loggedIn$" (click)="logout()">
3434
<a [routerLink]="['/']">
35-
<span class="glyphicon glyphicon-user"></span> Welcome, {{ user$.username }} - Logout
35+
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Welcome, {{ user$.username }} - Logout
3636
</a>
3737
</li>
3838
</ul>

Views/Shared/_Layout.cshtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<title>@ViewData["Title"] - Angular2 ASPNET Core - Starter</title>
88
<base href="/" />
99

10+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
1011
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
1112

12-
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
13+
<!--<link rel="stylesheet" href="http://github.com/~/dist/vendor.css" asp-append-version="true" />-->
1314

1415
</head>
1516

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@
7979
"angular2-template-loader": "0.6.0",
8080
"awesome-typescript-loader": "2.2.4",
8181
"codelyzer": "1.0.0-beta.4",
82+
"core-js": "^2.4.1",
8283
"css": "^2.2.1",
8384
"css-loader": "^0.25.0",
8485
"es6-promise": "3.2.1",
8586
"es6-promise-loader": "1.0.2",
86-
"es6-shim": "^0.35.1",
8787
"expose-loader": "^0.7.1",
8888
"extract-text-webpack-plugin": "^2.0.0-beta.4",
8989
"file-loader": "^0.9.0",

webpack.config.vendor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = {
3737
'@angular/platform-server',
3838
'angular2-universal',
3939
'angular2-universal-polyfills',
40-
'es6-shim',
40+
'core-js',
4141
'es6-promise',
4242
'zone.js',
4343
]

0 commit comments

Comments
 (0)