-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from upmaru/feature/ops-564-clean-up-user-login…
…-page Feature/ops 564 clean up user login page
- Loading branch information
Showing
5 changed files
with
131 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,10 +8,14 @@ | |
</div> | ||
<div class="hidden md:block"> | ||
<div class="ml-10 flex items-baseline space-x-4"> | ||
<!-- Current: "bg-slate-900 text-white", Default: "text-slate-300 hover:bg-slate-700 hover:text-white" --> | ||
<!-- Current: "bg-slate-900 text-white", Default: "" --> | ||
<.link | ||
href={~p"/"} | ||
class="bg-slate-900 text-white rounded-md px-3 py-2 text-sm font-medium" | ||
class={ | ||
if assigns[:current_path] == ~p"/", | ||
do: "bg-slate-900 text-white rounded-md px-3 py-2 text-sm font-medium", | ||
else: "text-slate-300 hover:bg-slate-700 hover:text-white" | ||
} | ||
aria-current="page" | ||
> | ||
<%= gettext("Home") %> | ||
|
@@ -21,27 +25,13 @@ | |
</div> | ||
<div class="hidden md:block"> | ||
<div class="ml-4 flex items-center md:ml-6"> | ||
<button | ||
type="button" | ||
class="relative rounded-full bg-slate-800 p-1 text-slate-400 hover:text-white focus:outline-none focus:ring-2 focus:ring-white focus:ring-offset-2 focus:ring-offset-slate-800" | ||
<.link | ||
href={~p"/users/log_in"} | ||
class="text-slate-300 rounded-md px-3 py-2 text-sm font-medium hover:bg-slate-900 hover:text-white" | ||
aria-current="page" | ||
> | ||
<span class="absolute -inset-1.5"></span> | ||
<span class="sr-only">View notifications</span> | ||
<svg | ||
class="h-6 w-6" | ||
fill="none" | ||
viewBox="0 0 24 24" | ||
stroke-width="1.5" | ||
stroke="currentColor" | ||
aria-hidden="true" | ||
> | ||
<path | ||
stroke-linecap="round" | ||
stroke-linejoin="round" | ||
d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" | ||
/> | ||
</svg> | ||
</button> | ||
<%= gettext("Sign In") %> | ||
</.link> | ||
</div> | ||
</div> | ||
<div class="-mr-2 flex md:hidden"> | ||
|
@@ -87,15 +77,64 @@ | |
<!-- Mobile menu, show/hide based on menu state. --> | ||
<div class="md:hidden" id="mobile-menu"> | ||
<div class="space-y-1 px-2 pb-3 pt-2 sm:px-3"> | ||
<!-- Current: "bg-slate-900 text-white", Default: "text-slate-300 hover:bg-slate-700 hover:text-white" --> | ||
<!-- Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" --> | ||
<.link | ||
href={~p"/"} | ||
class="bg-slate-900 text-white rounded-md px-3 py-2 text-sm font-medium" | ||
class="bg-slate-900 text-white block rounded-md px-3 py-2 text-base font-medium" | ||
aria-current="page" | ||
> | ||
<%= gettext("Home") %> | ||
</.link> | ||
</div> | ||
<div class="border-t border-gray-700 pb-3 pt-4"> | ||
<div class="flex items-center px-5"> | ||
<div class="ml-3"> | ||
<div class="text-base font-medium leading-none text-white">Tom Cook</div> | ||
<div class="text-sm font-medium leading-none text-gray-400">[email protected]</div> | ||
</div> | ||
<button | ||
type="button" | ||
class="relative ml-auto flex-shrink-0 rounded-full bg-gray-800 p-1 text-gray-400 hover:text-white focus:outline-none focus:ring-2 focus:ring-white focus:ring-offset-2 focus:ring-offset-gray-800" | ||
> | ||
<span class="absolute -inset-1.5"></span> | ||
<span class="sr-only">View notifications</span> | ||
<svg | ||
class="h-6 w-6" | ||
fill="none" | ||
viewBox="0 0 24 24" | ||
stroke-width="1.5" | ||
stroke="currentColor" | ||
aria-hidden="true" | ||
> | ||
<path | ||
stroke-linecap="round" | ||
stroke-linejoin="round" | ||
d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" | ||
/> | ||
</svg> | ||
</button> | ||
</div> | ||
<div class="mt-3 space-y-1 px-2"> | ||
<a | ||
href="#" | ||
class="block rounded-md px-3 py-2 text-base font-medium text-gray-400 hover:bg-gray-700 hover:text-white" | ||
> | ||
Your Profile | ||
</a> | ||
<a | ||
href="#" | ||
class="block rounded-md px-3 py-2 text-base font-medium text-gray-400 hover:bg-gray-700 hover:text-white" | ||
> | ||
Settings | ||
</a> | ||
<a | ||
href="#" | ||
class="block rounded-md px-3 py-2 text-base font-medium text-gray-400 hover:bg-gray-700 hover:text-white" | ||
> | ||
Sign out | ||
</a> | ||
</div> | ||
</div> | ||
</div> | ||
</nav> | ||
</div> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters