diff --git a/hodor/static/css/sidebar.css b/hodor/static/css/sidebar.css index 8425555e8c30b19e158085242e05eb153edc01dd..978b911000fc35b1349a2fb125a829770f8702dd 100644 --- a/hodor/static/css/sidebar.css +++ b/hodor/static/css/sidebar.css @@ -25,7 +25,6 @@ overflow:visible; margin-top: 3.2em; margin-top: 50px !important; background:#101010; -border-right:1px solid #e5e5e5; position:absolute; top:0; bottom:0; @@ -139,4 +138,3 @@ height: 100%; url(http://themes.googleusercontent.com/static/fonts/titilliumweb/v2/anMUvcNT0H1YN4FII8wpr24bNCNEoFTpS2BTjF6FB5E.woff) format('woff'); } - diff --git a/hodor/static/img/hodor-inverse.png b/hodor/static/img/hodor-inverse.png new file mode 100644 index 0000000000000000000000000000000000000000..8395819f798f978da598a1bfd09aac48dbc8ee6a Binary files /dev/null and b/hodor/static/img/hodor-inverse.png differ diff --git a/hodor/templates/layout/nav-app.html b/hodor/templates/layout/nav-app.html new file mode 100644 index 0000000000000000000000000000000000000000..ca58c5ee27739b3b8357a50682bb2d86a9422e90 --- /dev/null +++ b/hodor/templates/layout/nav-app.html @@ -0,0 +1,25 @@ +<nav class="navbar navbar-expand-lg navbar-dark justify-content-between hodor-nav" style="background-color:#101010;"> + <div class="container-fluid"> + <div class="row"> + <a class="navbar-brand nav-hodor float-sm-left" href="#"> + <img src="{{ url_for('static', filename='img/hodor-inverse.png') }}" width="60" class="d-inline-block align-top" alt=""> + </a> + </div> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + <div class="collapse navbar-collapse" id="navbarText"> + <ul class="nav navbar-nav mr-auto"></ul> <!-- Stupid Bootstrap --> + <ul class="nav navbar-nav"> + <span class="navbar-text mr-4"> + <!-- TO DO: Change Guest to a variable --> + Welcome, <span style="font-weight: bolder; color: white;"> Guest</span> + </span> + <ul class="nav-item"> + <button class="btn btn-outline-success my-2 my-sm-0 mr-3 cd-signin" >Sign In</button> + <button class="btn btn-outline-info my-2 my-sm-0 mr-3 cd-signup" >Register</button> + </ul> + </ul> + </div> + </div> +</nav> diff --git a/hodor/templates/layout/sidebar.html b/hodor/templates/layout/sidebar.html index aab4932c007d0df2cc82a05c2d85ab4a8b5a1c8c..4899b3de91b2d5a039cba362600a3d8b34f47e46 100644 --- a/hodor/templates/layout/sidebar.html +++ b/hodor/templates/layout/sidebar.html @@ -1,4 +1,4 @@ - +{% include 'layout/nav-app.html' %} <div class="area"> </div> <nav class="main-menu">