more tinkering with search. wip

static/css/style-global.css

@@ -198,6 +198,16 @@
 
 /*custom*/
 
+	.right
+	{
+		padding-left: ;
+	}
+
+	#search
+	{
+		padding: 10px 15px;
+	}
+
 	#search > form 
 	{
 		display: flex;
@@ -224,25 +234,16 @@
 		margin-right: auto;
 	}
 
-	nav
-	{
-		padding: 1em 2em;
-	}
-
 	#user-nav
 	{
-		display: inline-block;
-	}
-
-	nav li
-	{
-		display: inline-block;
+		display: flex;
+		flex-flow: row wrap;
+		justify-content: flex-start;
 	}
 
 	#search
 	{
-		display: inline-block;
-		float: right;
+		align-self: flex-end;
 		width: 250px;
 	}
 

templates/default-layout.hamlet

@@ -1,23 +1,24 @@
 <nav id="header">
-  <div id="top-nav">
-  <ul id="user-nav">
-    <li>
+  <ul id="user-nav" .nav .nav-pills>
+    <li role="presentation">
       <a href=@{HomeR}>Home
     $maybe su <- msu
-      Logged in as <a href=@{UserR $ getUsername su}>#{getSlug su}<br>
-      <li>
+      <li role="presentation">
+        <a href=@{UserR username}>#{slug}<br>
+      <li role="presentation">
         <a href=@{LogoutR}>Logout
-      <li>
+      <li role="presentation">
         <a href=@{NewAlbumR}>Create album
-      <li>
+      <li role="presentation">
         <a href=@{UploadR}>Upload images
     $nothing
-      <li>
+      <li role="presentation">
         <a href=@{LoginR}>Login
       $if block == False
-        <li>
+        <li role="presentation">
           <a href=@{SignupR}>Signup
-  <div #search .right>
+    <li role="presentation" #search>
+      <div #search>
         ^{pageBody searchWidget}
 
 $maybe msg <- mmsg