Skip to content

Commit afd65e2

Browse files
scottbrady91scottbrady91
committed
Updated bootstrap and fixed navbar responsiveness
1 parent 51a1f9a commit afd65e2

10 files changed

Lines changed: 300 additions & 234 deletions

File tree

‎src/IdentityManager2/Areas/IdentityManager/Pages/Index.cshtml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
<!DOCTYPE html>
44
<html>
55
<head>
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
76
<meta charset="utf-8" />
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
89
<title>IdentityManager 2</title>
910
<link href="@Model.PathBase/assets/Content.bootstrap.min.css" rel="stylesheet" />
1011
<link href="@Model.PathBase/assets/Content.Style.min.css" rel="stylesheet" />

‎src/IdentityManager2/Assets/Content/bootstrap.min.css‎

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

‎src/IdentityManager2/Assets/Content/fonts/glyphicons-halflings-regular.eot‎

-208 Bytes
Binary file not shown.

‎src/IdentityManager2/Assets/Content/fonts/glyphicons-halflings-regular.svg‎

Lines changed: 272 additions & 213 deletions
Loading

‎src/IdentityManager2/Assets/Content/fonts/glyphicons-halflings-regular.ttf‎

4.03 KB
Binary file not shown.

‎src/IdentityManager2/Assets/Content/fonts/glyphicons-halflings-regular.woff‎

104 Bytes
Binary file not shown.

‎src/IdentityManager2/Assets/Content/fonts/glyphicons-halflings-regular.woff2‎

17.6 KB
Binary file not shown.

‎src/IdentityManager2/Assets/Scripts/Bundle.js‎

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

‎src/IdentityManager2/Assets/Scripts/Libs/bootstrap.min.js‎

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

‎src/IdentityManager2/Assets/Templates/navbar.html‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@
44
<img ng-src="{{PathBase}}/assets/Content.logo.png" class="logo-banner">
55
IdentityManager 2
66
</a>
7+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav" aria-expanded="false">
8+
<span class="sr-only">Toggle navigation</span>
9+
<span class="icon-bar"></span>
10+
<span class="icon-bar"></span>
11+
<span class="icon-bar"></span>
12+
</button>
713
</div>
8-
<ul class="nav navbar-nav">
9-
<li ng-show="layout.links.users"><a href="#/users/list">All Users</a></li>
10-
<li ng-show="layout.links.createUser"><a href="#/users/create">New User</a></li>
11-
<li ng-show="layout.links.roles"><a href="#/roles/list">All Roles</a></li>
12-
<li ng-show="layout.links.createRole"><a href="#/roles/create">New Role</a></li>
13-
<li ng-show="layout.showLogin"><a href="#/" ng-click="login()" idm-prevent-default>Login</a></li>
14-
<li ng-show="layout.showLogout"><a href="#/" ng-click="logout()" idm-prevent-default>Logout</a></li>
15-
</ul>
14+
<div class="collapse navbar-collapse" id="nav">
15+
<ul class="nav navbar-nav">
16+
<li data-toggle="collapse" data-target="#nav" ng-show="layout.links.users"><a href="#/users/list">All Users</a></li>
17+
<li data-toggle="collapse" data-target="#nav" ng-show="layout.links.createUser"><a href="#/users/create">New User</a></li>
18+
<li data-toggle="collapse" data-target="#nav" ng-show="layout.links.roles"><a href="#/roles/list">All Roles</a></li>
19+
<li data-toggle="collapse" data-target="#nav" ng-show="layout.links.createRole"><a href="#/roles/create">New Role</a></li>
20+
<li data-toggle="collapse" data-target="#nav" ng-show="layout.showLogin"><a href="#/" ng-click="login()" idm-prevent-default>Login</a></li>
21+
<li data-toggle="collapse" data-target="#nav" ng-show="layout.showLogout"><a href="#/" ng-click="logout()" idm-prevent-default>Logout</a></li>
22+
</ul>
1623

17-
<span class="navbar-text pull-right">{{layout.username}}</span>
24+
<span class="navbar-text pull-right">{{layout.username}}</span>
25+
</div>
1826
</div>

0 commit comments

Comments
 (0)