Merge pull request #1933 from jvanbraekel/master

Update layout navbar for centering navbar items
This commit is contained in:
mdipierro authored and GitHub committed 2018-06-01 12:44:50 -05:00
commit 246b5293e5
1 file changed
+8 -8
+8 -8
View File
@@ -35,13 +35,13 @@
<body> <body>
<div class="w2p_flash alert alert-dismissable">{{=response.flash or ''}}</div> <div class="w2p_flash alert alert-dismissable">{{=response.flash or ''}}</div>
<!-- Navbar ======================================= --> <!-- Navbar ======================================= -->
<nav class="navbar navbar-expand-lg navbar-light bg-faded"> <nav class="navbar navbar-light navbar-expand-md bg-faded justify-content-center">
<a class="navbar-brand" href="http://web2py.com">web2py</a> <a href="http://web2py.com" class="navbar-brand d-flex w-50 mr-auto">web2py</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div id="navbarNavDropdown" class="collapse navbar-collapse"> <div class="navbar-collapse collapse w-100" id="navbarNavDropdown">
<ul class="navbar-nav"> <ul class="navbar-nav w-100 justify-content-center">
{{for _item in response.menu or []:}} {{for _item in response.menu or []:}}
{{if len(_item)<4 or not _item[3]:}} {{if len(_item)<4 or not _item[3]:}}
<li class="nav-item {{if _item[1]:}}active{{pass}}"> <li class="nav-item {{if _item[1]:}}active{{pass}}">
@@ -59,11 +59,11 @@
{{pass}} {{pass}}
{{pass}} {{pass}}
</ul> </ul>
<form class="form-inline my-2 my-lg-0"> <form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search"> <input class="form-control mr-sm-2" type="text" placeholder="Search">
</form> </form>
{{if 'auth' in globals():}} {{if 'auth' in globals():}}
<ul class="navbar-nav ml-lg-auto"> <ul class="nav navbar-nav ml-auto w-100 justify-content-end">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{if auth.user:}}{{=auth.user.first_name}}{{else:}}LOGIN{{pass}} {{if auth.user:}}{{=auth.user.first_name}}{{else:}}LOGIN{{pass}}