diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/layouts/application.html.haml | 24 | ||||
-rw-r--r-- | app/views/users/sessions/.new.html.haml.swo | bin | 12288 -> 0 bytes |
2 files changed, 12 insertions, 12 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f15945e..ee028b4 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml | |||
@@ -11,17 +11,17 @@ | |||
11 | - if flash[:notice] | 11 | - if flash[:notice] |
12 | %div#flash.flash-notice= flash[:notice] | 12 | %div#flash.flash-notice= flash[:notice] |
13 | #container | 13 | #container |
14 | %header#banner feffernoo.se | ||
15 | #main | 14 | #main |
15 | %header#banner= link_to "feffernoo.se", root_url | ||
16 | #content= yield | 16 | #content= yield |
17 | #sidebar | 17 | #sidebar |
18 | .sidebar-module | 18 | .sidebar-module |
19 | %h2 I'm Fef. | 19 | %h2 I'm Fef. |
20 | %p I'm a computer science undergrad at Carnegie Mellon University. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot. | 20 | %p I'm a computer science undergrad at Carnegie Mellon University. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot. |
21 | .sidebar-module | 21 | .sidebar-module |
22 | %h2 Meta | 22 | %h2 Meta |
23 | %ul | 23 | %ul |
24 | - if not user_signed_in? | 24 | - if not user_signed_in? |
25 | %li= link_to "Log in", new_user_session_path | 25 | %li= link_to "Log in", new_user_session_path |
26 | - if user_signed_in? | 26 | - if user_signed_in? |
27 | %li= link_to "Log out", destroy_user_session_path, method: :delete | 27 | %li= link_to "Log out", destroy_user_session_path, method: :delete |
diff --git a/app/views/users/sessions/.new.html.haml.swo b/app/views/users/sessions/.new.html.haml.swo deleted file mode 100644 index 85950d9..0000000 --- a/app/views/users/sessions/.new.html.haml.swo +++ /dev/null | |||
Binary files differ | |||