From cd27c3182f007a827e2acb2fb00e919120903fa6 Mon Sep 17 00:00:00 2001 From: "Sachin S. Kamath" <sskamath96@gmail.com> Date: Tue, 3 Oct 2017 12:32:22 +0530 Subject: [PATCH] Integrate sidebar and navbar into app Signed-off-by: Sachin S. Kamath <sskamath96@gmail.com> --- hodor/static/css/sidebar.css | 2 -- hodor/static/img/hodor-inverse.png | Bin 0 -> 48284 bytes hodor/templates/layout/nav-app.html | 25 +++++++++++++++++++++++++ hodor/templates/layout/sidebar.html | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 hodor/static/img/hodor-inverse.png create mode 100644 hodor/templates/layout/nav-app.html diff --git a/hodor/static/css/sidebar.css b/hodor/static/css/sidebar.css index 8425555..978b911 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 GIT binary patch literal 48284 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 literal 0 HcmV?d00001 diff --git a/hodor/templates/layout/nav-app.html b/hodor/templates/layout/nav-app.html new file mode 100644 index 0000000..ca58c5e --- /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 aab4932..4899b3d 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"> -- GitLab