2 files changed, 36 insertions, 39 deletions
diff --git a/src/OAuth/OAuthAuthorizationServer/Views/Shared/LogOnUserControl.ascx b/src/OAuth/OAuthAuthorizationServer/Views/Shared/LogOnUserControl.ascx
index 9afaab3..b88363c 100644
--- a/src/OAuth/OAuthAuthorizationServer/Views/Shared/LogOnUserControl.ascx
+++ b/src/OAuth/OAuthAuthorizationServer/Views/Shared/LogOnUserControl.ascx
@@ -1,14 +1,22 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<%
-    if (Request.IsAuthenticated) {
-%>
-        Welcome <b><%: Page.User.Identity.Name %></b>!
-        [ <%: Html.ActionLink("Log Off", "LogOff", "Account") %> ]
-<%
-    }
-    else {
-%> 
-        [ <%: Html.ActionLink("Log On", "LogOn", "Account") %> ]
-<%
-    }
-%>
+<div class="collapse navbar-collapse navbar-right" id="dnoa-navbar-collapse-1">
+    <%
+        if (Request.IsAuthenticated)
+        {
+    %>
+    <div class="navbar-text">Welcome <b><%= Html.Encode(Page.User.Identity.Name) %></b>!</div>
+    <ul class="nav navbar-nav">
+        <li class="active"><%= Html.ActionLink("Log Off", "LogOff", "Account") %></li>
+    </ul>
+    <%
+        }
+        else
+        {
+    %>
+    <ul class="nav navbar-nav">
+        <li class="active"><%= Html.ActionLink("Log On", "LogOn", "Account") %></li>
+    </ul>
+    <%
+        }
+    %>
+</div>
diff --git a/src/OAuth/OAuthAuthorizationServer/Views/Shared/Site.Master b/src/OAuth/OAuthAuthorizationServer/Views/Shared/Site.Master
index 43f68e1..e625330 100644
--- a/src/OAuth/OAuthAuthorizationServer/Views/Shared/Site.Master
+++ b/src/OAuth/OAuthAuthorizationServer/Views/Shared/Site.Master
@@ -4,37 +4,26 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title><asp:ContentPlaceHolder ID="TitleContent" runat="server" /></title>
-    <link href="../../Content/Site.css" rel="stylesheet" type="text/css" />
+    <link href='/Content/bootstrap.yeti.min.css' rel="stylesheet" type="text/css" />
 </head>
 
 <body>
-    <div class="page">
-
-        <div id="header">
-            <div id="title">
-                <h1>DotNetOpenAuth OAuth 2.0 Authorization Server</h1>
-            </div>
-              
-            <div id="logindisplay">
-                <% Html.RenderPartial("LogOnUserControl"); %>
-            </div> 
-            
-            <div id="menucontainer">
-            
-                <ul id="menu">              
-                    <li><%: Html.ActionLink("Home", "Index", "Home")%></li>
-                    <li><%: Html.ActionLink("About", "About", "Home")%></li>
-                </ul>
-            
-            </div>
-        </div>
-
-        <div id="main">
-            <asp:ContentPlaceHolder ID="MainContent" runat="server" />
-
-            <div id="footer">
+   <nav class="navbar navbar-default">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#dnoa-navbar-collapse-1" aria-expanded="false">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="<%= Url.Action("Index", "Home")%>">DotNetOpenAuth OAuth 2.0 Authorization Server</a>
             </div>
+            <% Html.RenderPartial("LogOnUserControl"); %>
         </div>
+    </nav>
+    <div class="container">
+        <asp:ContentPlaceHolder ID="MainContent" runat="server" />
     </div>
 </body>
 </html>