more tinkering with search. wip
This commit is contained in:
parent
edf906e418
commit
596fb0ffff
2 changed files with 26 additions and 24 deletions
|
@ -198,6 +198,16 @@
|
||||||
|
|
||||||
/*custom*/
|
/*custom*/
|
||||||
|
|
||||||
|
.right
|
||||||
|
{
|
||||||
|
padding-left: ;
|
||||||
|
}
|
||||||
|
|
||||||
|
#search
|
||||||
|
{
|
||||||
|
padding: 10px 15px;
|
||||||
|
}
|
||||||
|
|
||||||
#search > form
|
#search > form
|
||||||
{
|
{
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -224,25 +234,16 @@
|
||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
nav
|
|
||||||
{
|
|
||||||
padding: 1em 2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#user-nav
|
#user-nav
|
||||||
{
|
{
|
||||||
display: inline-block;
|
display: flex;
|
||||||
}
|
flex-flow: row wrap;
|
||||||
|
justify-content: flex-start;
|
||||||
nav li
|
|
||||||
{
|
|
||||||
display: inline-block;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#search
|
#search
|
||||||
{
|
{
|
||||||
display: inline-block;
|
align-self: flex-end;
|
||||||
float: right;
|
|
||||||
width: 250px;
|
width: 250px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,25 @@
|
||||||
<nav id="header">
|
<nav id="header">
|
||||||
<div id="top-nav">
|
<ul id="user-nav" .nav .nav-pills>
|
||||||
<ul id="user-nav">
|
<li role="presentation">
|
||||||
<li>
|
|
||||||
<a href=@{HomeR}>Home
|
<a href=@{HomeR}>Home
|
||||||
$maybe su <- msu
|
$maybe su <- msu
|
||||||
Logged in as <a href=@{UserR $ getUsername su}>#{getSlug su}<br>
|
<li role="presentation">
|
||||||
<li>
|
<a href=@{UserR username}>#{slug}<br>
|
||||||
|
<li role="presentation">
|
||||||
<a href=@{LogoutR}>Logout
|
<a href=@{LogoutR}>Logout
|
||||||
<li>
|
<li role="presentation">
|
||||||
<a href=@{NewAlbumR}>Create album
|
<a href=@{NewAlbumR}>Create album
|
||||||
<li>
|
<li role="presentation">
|
||||||
<a href=@{UploadR}>Upload images
|
<a href=@{UploadR}>Upload images
|
||||||
$nothing
|
$nothing
|
||||||
<li>
|
<li role="presentation">
|
||||||
<a href=@{LoginR}>Login
|
<a href=@{LoginR}>Login
|
||||||
$if block == False
|
$if block == False
|
||||||
<li>
|
<li role="presentation">
|
||||||
<a href=@{SignupR}>Signup
|
<a href=@{SignupR}>Signup
|
||||||
<div #search .right>
|
<li role="presentation" #search>
|
||||||
^{pageBody searchWidget}
|
<div #search>
|
||||||
|
^{pageBody searchWidget}
|
||||||
|
|
||||||
$maybe msg <- mmsg
|
$maybe msg <- mmsg
|
||||||
<div #message>#{msg}
|
<div #message>#{msg}
|
||||||
|
|
Loading…
Reference in a new issue