aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--apioforum/static/style.css8
-rw-r--r--apioforum/templates/base.html50
2 files changed, 28 insertions, 30 deletions
diff --git a/apioforum/static/style.css b/apioforum/static/style.css
index 4273de3..4efc1ec 100644
--- a/apioforum/static/style.css
+++ b/apioforum/static/style.css
@@ -50,11 +50,9 @@ body { font-family: sans-serif }
img { max-width: 100% }
-nav ul { list-style-type: none; margin: 0px; padding: 0px }
-nav { width:max-content; padding: 5px; margin: 2px; border: 1px solid black }
-nav li { margin-left: 15px; margin-bottom: 10px; margin-right: 10px }
-nav li {display: inline }
-nav li:first-of-type { margin-left:0.5em }
+nav { width:max-content; padding: 5px; margin: 2px; border: 1px solid black; display:flex; align-items: center }
+nav p { margin-left: 15px; margin-top: 0; margin-bottom: 0; margin-right: 10px; padding: 0 }
+nav p:first-of-type { margin-left:0.5em }
nav { float: right }
nav a { color: blue; text-decoration: none }
diff --git a/apioforum/templates/base.html b/apioforum/templates/base.html
index 37edcb8..6783862 100644
--- a/apioforum/templates/base.html
+++ b/apioforum/templates/base.html
@@ -8,32 +8,32 @@
</head>
<body>
<nav>
- <ul>
- <li>
- <span style="font-family: monospace;"><b>apio</b><i>forum</i>&trade;</span>
- </li>
- <li><a href="{{url_for('index')}}">home</a></li>
+ <p style="font-family: monospace;"><b>apio</b><i>forum</i>&trade;</p>
+ <form class="search-form" action="/search">
+ <input type="search" placeholder="query" name="q">
+ <input type="submit" value="search">
+ </form>
+ <p><a href="{{url_for('index')}}">home</a></p>
- {% if g.user %}
- <li>{{ g.user }}</li>
- <li>
- <a href="{{ url_for('auth.logout',next=request.path) }}">
- logout
- </a>
- </li>
- {% else %}
- <li>
- <a href="{{ url_for('auth.login',next=request.path) }}">
- login
- </a>
- </li>
- <li>
- <a href="{{ url_for('auth.register',next=request.path) }}">
- register
- </a>
- </li>
- {% endif %}
- </ul>
+ {% if g.user %}
+ <p>{{ g.user }}</p>
+ <p>
+ <a href="{{ url_for('auth.logout',next=request.path) }}">
+ logout
+ </a>
+ </p>
+ {% else %}
+ <p>
+ <a href="{{ url_for('auth.login',next=request.path) }}">
+ login
+ </a>
+ </p>
+ <p>
+ <a href="{{ url_for('auth.register',next=request.path) }}">
+ register
+ </a>
+ </p>
+ {% endif %}
</nav>
<div class="header">