From 187ef17f56d4f8c7ca51ba16d9e6f4252af67c5c Mon Sep 17 00:00:00 2001 From: Stefano Alberto Russo <stefano.russo@gmail.com> Date: Sat, 23 Oct 2021 16:54:44 +0200 Subject: [PATCH] Minor graphical navbar fixes. --- .../core_app/static/css/stylish-portfolio.css | 12 ++++---- .../core_app/templates/navigation.html | 28 ++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/services/webapp/code/rosetta/core_app/static/css/stylish-portfolio.css b/services/webapp/code/rosetta/core_app/static/css/stylish-portfolio.css index b69a79b..7662b3b 100644 --- a/services/webapp/code/rosetta/core_app/static/css/stylish-portfolio.css +++ b/services/webapp/code/rosetta/core_app/static/css/stylish-portfolio.css @@ -142,9 +142,9 @@ hr.small { z-index: 1000; position: fixed; right: 0; - width: 250px; + width: 240px; height: 100%; - margin-right: -250px; + margin-right: -240px; overflow-y: auto; background: #222; -webkit-transition: all 0.4s ease 0s; @@ -157,7 +157,7 @@ hr.small { .sidebar-nav { position: absolute; top: 0; - width: 250px; + width: 240px; margin: 0; padding: 0; list-style: none; @@ -165,7 +165,7 @@ hr.small { .sidebar-nav li { text-indent: 20px; - line-height: 27px; + line-height: 32px; } .sidebar-nav li a { @@ -210,8 +210,8 @@ hr.small { } #sidebar-wrapper.active { - right: 250px; - width: 250px; + right: 240px; + width: 240px; -webkit-transition: all 0.4s ease 0s; -moz-transition: all 0.4s ease 0s; -ms-transition: all 0.4s ease 0s; diff --git a/services/webapp/code/rosetta/core_app/templates/navigation.html b/services/webapp/code/rosetta/core_app/templates/navigation.html index ddc02bb..cf6829d 100644 --- a/services/webapp/code/rosetta/core_app/templates/navigation.html +++ b/services/webapp/code/rosetta/core_app/templates/navigation.html @@ -3,22 +3,17 @@ <a id="menu-toggle" href="#" class="btn btn-light btn-lg toggle" style="border:1px solid #c0c0c0"><i class="fa fa-bars" ></i></a> <nav id="sidebar-wrapper"> <ul class="sidebar-nav"> - <a id="menu-close" href="#" class="btn btn-light btn-lg pull-right toggle"><i class="fa fa-times"></i></a> - <br/> - <br/> - <li class="sidebar-brand"> - <a href="/main/#top" onclick = $("#menu-close").click(); >Menu</a> - </li> - <li> - <a href="/main/#top" onclick = $("#menu-close").click(); >Home</a> - </li> - {% if not user.is_authenticated %} - <li> - <a href="/register" onclick = $("#menu-close").click(); >Register</a> + + + <a id="menu-close" href="#" class="btn btn-light btn-lg pull-right toggle"><i class="fa fa-times"></i></a> + <a href="/main" class="btn btn-light btn-lg pull-right toggle"><i class="fa fa-home"></i></a> + + + <li class="sidebar-brand" style="margin-top:50px"> + <a onclick = $("#menu-close").click(); >Menu</a> </li> - {% endif %} - <br/> - <hr> + + <hr style="margin-top:10px; margin-bottom:20px; margin-left:10px; margin-right:10px"> {% if user.is_authenticated %} <li> @@ -56,7 +51,8 @@ <li style="padding-left:0; text-indent: 0"> <a href="{% url 'oidc_authentication_init' %}" style="padding-left:0; text-indent: 0">Login with OpenID Connect</a></li> {% endif %} <div style="padding:10px;"> - <font color="gray">Forgot password? Just leave it empty to get a login link by email.</font> + <font color="gray">Forgot password? Just leave it empty to get a login link by email. + Or, <a href="/register" style="color: #c0c0c0" onclick = $("#menu-close").click(); >Register</a>.</font> </div> </center> {% endif %} -- GitLab